A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2

webkit/compositor_bindings/web_layer_tree_view_unittest.cc

Index: webkit/compositor_bindings/web_layer_tree_view_unittest.cc
===================================================================
--- webkit/compositor_bindings/web_layer_tree_view_unittest.cc	(revision 165906)
+++ webkit/compositor_bindings/web_layer_tree_view_unittest.cc	(working copy)
@@ -46,12 +46,7 @@
         initializeCompositor();
         m_rootLayer.reset(new WebLayerImpl);
         m_view.reset(new WebLayerTreeViewImpl(client()));
-        scoped_ptr<cc::Thread> implCCThread(NULL);
-        if (m_implThread)
-            implCCThread = cc::ThreadImpl::createForDifferentThread(
-                m_implThread->message_loop_proxy());
-        ASSERT_TRUE(m_view->initialize(WebLayerTreeView::Settings(),
-                                       implCCThread.Pass()));
+        ASSERT_TRUE(m_view->initialize(WebLayerTreeView::Settings()));
         m_view->setRootLayer(*m_rootLayer);
         m_view->setSurfaceReady();
     }
@@ -67,7 +62,6 @@
 protected:
     scoped_ptr<WebLayer> m_rootLayer;
     scoped_ptr<WebLayerTreeViewImpl> m_view;
-    scoped_ptr<base::Thread> m_implThread;
 };
 
 class WebLayerTreeViewSingleThreadTest : public WebLayerTreeViewTestBase {
@@ -93,6 +87,7 @@
 protected:
     virtual ~WebLayerTreeViewThreadedTest()
     {
+        cc::Proxy::setImplThread(0);
     }
 
     void composite()
@@ -110,6 +105,8 @@
     {
         m_implThread.reset(new base::Thread("ThreadedTest"));
         ASSERT_TRUE(m_implThread->Start());
+        m_implCCThread = cc::ThreadImpl::createForDifferentThread(m_implThread->message_loop_proxy());
+        cc::Proxy::setImplThread(m_implCCThread.get());
     }
 
     virtual WebLayerTreeViewClient* client() OVERRIDE
@@ -118,6 +115,8 @@
     }
 
     MockWebLayerTreeViewClientForThreadedTests m_client;
+    scoped_ptr<base::Thread> m_implThread;
+    scoped_ptr<cc::Thread> m_implCCThread;
     base::CancelableClosure m_timeout;
 };