Revert "Add names to tuple-parameterized tests"

This reverts commit 7456a5e0.

Reason for revert: Suspecting as cause of crbug.com/1123758.

Original change's description:
> Add names to tuple-parameterized tests
> 
> Test names can only contain alphanumeric characters, plus underscores.
> testing::PrintToStringParamName() stringifies tuples using characters
> that aren't valid for test names.
> 
> Add a similar function which joins each element using underscores. This
> will generate valid names for test parameterization, provided each
> element of the tuple can be written using valid characters.
> 
> Bug: 1092945, 1117587
> Change-Id: I868b1d4040a93bdbf763dbb45b94ff15f181dd18
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2376882
> Reviewed-by: kylechar <kylechar@chromium.org>
> Commit-Queue: Sean Gilhuly <sgilhuly@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#803182}

TBR=kylechar@chromium.org,sgilhuly@chromium.org

Change-Id: I7ef3a845df745a1b7cdd4fe09ba24e76abb26138
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1092945
Bug: 1117587
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2387036Reviewed-by: Darren Shen <shend@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803333}

cc/test/test_types.h

@@ -6,29 +6,9 @@
 #define CC_TEST_TEST_TYPES_H_
 
 #include <ostream>
-#include <string>
-
-#include "base/strings/string_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
-// Joins all elements of a testing::tuple using an underscore. Use as the fourth
-// parameter of INSTANTIATE_TEST_SUITE_P() instead of
-// testing::PrintToStringParamName() to generate a valid parameter label. Each
-// element of the tuple must be printable, and each combination of tuple values
-// must produce a unique string.
-// Underscores shouldn't be used in test suite names due to a risk of name
-// collision, but this doesn't apply to parameterization labels.
-struct PrintTupleToStringParamName {
-  template <class ParamType>
-  std::string operator()(const testing::TestParamInfo<ParamType>& info) const {
-    return base::JoinString(
-        testing::internal::UniversalTersePrintTupleFieldsToStrings(info.param),
-        "_");
-  }
-};
-
 enum class TestRendererType {
   kGL,
   kSkiaGL,
@@ -55,7 +35,9 @@ struct RasterTestConfig {
 void PrintTo(TestRendererType type, std::ostream* os);
 
 // Joins the |renderer_type| and |raster_type| labels using an underscore
-// character, resulting in e.g. "Test/SkiaGL_OOP".
+// character, resulting in e.g. "Test/SkiaGL_OOP". Underscores shouldn't be used
+// in test suite names due to a risk of name collision, but this doesn't apply
+// to parameterization labels.
 void PrintTo(const RasterTestConfig& config, std::ostream* os);
 
 }  // namespace cc

cc/trees/layer_tree_host_pixeltest_blending.cc

@@ -21,12 +21,6 @@
 
 #if !defined(OS_ANDROID)
 
-// SkBlendMode is declared in the global namespace, so this function also needs
-// to be in the global namespace.
-void PrintTo(SkBlendMode mode, std::ostream* os) {
-  *os << SkBlendMode_Name(mode);
-}
-
 namespace cc {
 namespace {
 
@@ -277,8 +271,7 @@ std::vector<RasterTestConfig> const kTestCases = {
 INSTANTIATE_TEST_SUITE_P(B,
                          LayerTreeHostBlendingPixelTest,
                          ::testing::Combine(::testing::ValuesIn(kTestCases),
-                                            ::testing::ValuesIn(kBlendModes)),
-                         PrintTupleToStringParamName());
+                                            ::testing::ValuesIn(kBlendModes)));
 
 TEST_P(LayerTreeHostBlendingPixelTest, BlendingWithRoot) {
   const int kRootWidth = 2;

cc/trees/layer_tree_host_unittest_copyrequest.cc

@@ -27,14 +27,6 @@
 #include "gpu/GLES2/gl2extchromium.h"
 
 namespace cc {
-
-// CompositorMode is declared in the cc namespace, so this function also needs
-// to be in the cc namespace.
-void PrintTo(CompositorMode mode, std::ostream* os) {
-  *os << (mode == CompositorMode::THREADED ? "MultiThreaded"
-                                           : "SingleThreaded");
-}
-
 namespace {
 
 auto CombineWithCompositorModes(const std::vector<TestRendererType>& types) {
@@ -177,8 +169,7 @@ INSTANTIATE_TEST_SUITE_P(All,
                          LayerTreeHostCopyRequestTestMultipleRequests,
                          CombineWithCompositorModes(
                              {TestRendererType::kGL, TestRendererType::kSkiaGL,
-                              TestRendererType::kSoftware}),
-                         PrintTupleToStringParamName());
+                              TestRendererType::kSoftware}));
 
 TEST_P(LayerTreeHostCopyRequestTestMultipleRequests, Test) {
   RunTest(compositor_mode());
@@ -213,8 +204,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestMultipleRequestsOutOfOrder,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestMultipleRequestsOutOfOrder, Test) {
   RunTest(compositor_mode());
@@ -273,8 +263,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestCompletionCausesCommit,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestCompletionCausesCommit, Test) {
   RunTest(compositor_mode());
@@ -381,8 +370,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestLayerDestroyed,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestLayerDestroyed, Test) {
   RunTest(compositor_mode());
@@ -488,8 +476,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestInHiddenSubtree,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestInHiddenSubtree, Test) {
   RunTest(compositor_mode());
@@ -610,8 +597,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest, Test) {
   RunTest(compositor_mode());
@@ -667,8 +653,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestClippedOut,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestClippedOut, Test) {
   RunTest(compositor_mode());
@@ -728,8 +713,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestScaledLayer,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestScaledLayer, Test) {
   RunTest(compositor_mode());
@@ -824,8 +808,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostTestAsyncTwoReadbacksWithoutDraw,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostTestAsyncTwoReadbacksWithoutDraw, Test) {
   RunTest(compositor_mode());
@@ -968,8 +951,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestDeleteSharedImage,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestDeleteSharedImage, Test) {
   RunTest(compositor_mode());
@@ -1112,8 +1094,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestCreatesSharedImage,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestCreatesSharedImage, Test) {
   RunTest(compositor_mode());
@@ -1201,8 +1182,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestDestroyBeforeCopy,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestDestroyBeforeCopy, Test) {
   RunTest(compositor_mode());
@@ -1285,8 +1265,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestShutdownBeforeCopy,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestShutdownBeforeCopy, Test) {
   RunTest(compositor_mode());
@@ -1418,8 +1397,7 @@ INSTANTIATE_TEST_SUITE_P(
     All,
     LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest,
     CombineWithCompositorModes({TestRendererType::kGL,
-                                TestRendererType::kSkiaGL}),
-    PrintTupleToStringParamName());
+                                TestRendererType::kSkiaGL}));
 
 TEST_P(LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest, Test) {
   RunTest(compositor_mode());