Reland "Shouldn't access LayerTreeTest::layer_tree_host on impl thread"

cc/test/layer_tree_test.h

Index: cc/test/layer_tree_test.h
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 1dbb86168d9a7de40136223bfeb1008865bcf6e2..1a28637d467943a88320b7e924b62833b8a87d4a 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -150,7 +150,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
 
   bool TestEnded() const { return ended_; }
 
-  LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); }
+  LayerTreeHost* layer_tree_host();
   bool delegating_renderer() const { return delegating_renderer_; }
 
   virtual scoped_ptr<OutputSurface> CreateOutputSurface() OVERRIDE;
@@ -239,4 +239,23 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   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_MAIN_THREAD_PAINT_TEST_F(TEST_FIXTURE_NAME)  \
+  TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DirectRenderer) {                \
+    RunTest(false, false, false);                                            \
+  }                                                                          \
+  class SingleThreadDirect##TEST_FIXTURE_NAME {};                            \
+  TEST_F(TEST_FIXTURE_NAME, RunSingleThread_DelegatingRenderer) {            \
+    RunTest(false, true, false);                                             \
+  }                                                                          \
+  class SingleThreadDelegating##TEST_FIXTURE_NAME {};                        \
+  TEST_F(TEST_FIXTURE_NAME, RunMultiThread_DirectRenderer_MainThreadPaint) { \
+    RunTest(true, false, false);                                             \
+  }                                                                          \
+  class MultiThreadDirect##TEST_FIXTURE_NAME {};                             \
+  TEST_F(TEST_FIXTURE_NAME,                                                  \
+         RunMultiThread_DelegatingRenderer_MainThreadPaint) {                \
+    RunTest(true, true, false);                                              \
+  }                                                                          \
+  class MultiThreadDelegatingNeedsSemicolon##TEST_FIXTURE_NAME {}
+
 #endif  // CC_TEST_LAYER_TREE_TEST_H_