Revert "Use named value-parameterized tests for angle_end2end_tests"

src/tests/test_utils/angle_test_configs.h

@@ -7,13 +7,6 @@
 #ifndef ANGLE_TEST_CONFIGS_H_
 #define ANGLE_TEST_CONFIGS_H_
 
-// On Linux EGL/egl.h includes X.h which does defines for some very common
-// names that are used by gtest (like None and Bool) and causes a lot of
-// compilation errors. To work around this, even if this file doesn't use it,
-// we include gtest before EGL so that it compiles fine in other files that
-// want to use gtest.
-#include <gtest/gtest.h>
-
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 

src/tests/test_utils/angle_test_instantiate.h

@@ -10,8 +10,6 @@
 #ifndef ANGLE_TEST_INSTANTIATE_H_
 #define ANGLE_TEST_INSTANTIATE_H_
 
-#include <gtest/gtest.h>
-
 #include "common/debug.h"
 
 namespace angle
@@ -43,9 +41,7 @@ std::vector<T> FilterTestParams(const T *params, size_t numParams)
 // arguments must match, and getRenderer must be implemented for that type.
 #define ANGLE_INSTANTIATE_TEST(testName, firstParam, ...) \
     const decltype(firstParam) testName##params[] = { firstParam, ##__VA_ARGS__ }; \
-    INSTANTIATE_TEST_CASE_P(, testName, \
-                              testing::ValuesIn(::angle::FilterTestParams(testName##params, ArraySize(testName##params))), \
-                              testing::PrintToStringParamName());
+    INSTANTIATE_TEST_CASE_P(, testName, testing::ValuesIn(::angle::FilterTestParams(testName##params, ArraySize(testName##params))));
 
 } // namespace angle