Don't run DirectRenderer versions of LayerTreeTest unless explicit.

Remove the direct variants from the SINGLE_AND_MULTI_THREAD_TEST_F
macros and friends, so you will only get a DirectRenderer if you
request it via SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F and
similar macros.

Before, cc_unittests has 3366 tests. After, it has 3075.

R=enne
BUG=606056
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_blink_rel

Review-Url: https://codereview.chromium.org/2170183002
Cr-Commit-Position: refs/heads/master@{#407037}

cc/output/delegating_renderer_unittest.cc

@@ -76,7 +76,7 @@ class DelegatingRendererTestDraw : public DelegatingRendererTest {
   gfx::Rect drawn_viewport_;
 };
 
-SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(DelegatingRendererTestDraw);
+SINGLE_AND_MULTI_THREAD_TEST_F(DelegatingRendererTestDraw);
 
 class DelegatingRendererTestResources : public DelegatingRendererTest {
  public:
@@ -125,7 +125,6 @@ class DelegatingRendererTestResources : public DelegatingRendererTest {
   }
 };
 
-SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(
-    DelegatingRendererTestResources);
+SINGLE_AND_MULTI_THREAD_TEST_F(DelegatingRendererTestResources);
 
 }  // namespace cc

cc/test/layer_tree_test.h

@@ -212,32 +212,24 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   }                                                             \
   class SingleThreadDirectImplNeedsSemicolon##TEST_FIXTURE_NAME {}
 
-#define SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
-  TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DelegatingRenderer) {   \
-    RunTest(CompositorMode::SINGLE_THREADED, true);                 \
-  }                                                                 \
+#define SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME)                   \
+  TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DelegatingRenderer) { \
+    RunTest(CompositorMode::SINGLE_THREADED, true);               \
+  }                                                               \
   class SingleThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {}
 
-#define SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME)            \
-  SINGLE_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
-  SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
-
 #define MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
   TEST_F(TEST_FIXTURE_NAME, RunMultiThread_DirectRenderer) {   \
     RunTest(CompositorMode::THREADED, false);                  \
   }                                                            \
   class MultiThreadDirectImplNeedsSemicolon##TEST_FIXTURE_NAME {}
 
-#define MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
-  TEST_F(TEST_FIXTURE_NAME, RunMultiThread_DelegatingRenderer) {   \
-    RunTest(CompositorMode::THREADED, true);                       \
-  }                                                                \
+#define MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)                   \
+  TEST_F(TEST_FIXTURE_NAME, RunMultiThread_DelegatingRenderer) { \
+    RunTest(CompositorMode::THREADED, true);                     \
+  }                                                              \
   class MultiThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {}
 
-#define MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)            \
-  MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
-  MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
-
 // The Remote mode tests don't need to run for delegated renderer.
 #define REMOTE_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
   TEST_F(TEST_FIXTURE_NAME, RunRemote_DirectRenderer) {  \
@@ -249,13 +241,9 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   SINGLE_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME);                \
   MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME)
 
-#define SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME) \
-  SINGLE_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME);                \
-  MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
-
-#define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)            \
-  SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
-  SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
+#define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
+  SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME);                \
+  MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
 
 // Some tests want to control when notify ready for activation occurs,
 // but this is not supported in the single-threaded case.