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

webkit/compositor_bindings/web_layer_tree_view_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "base/cancelable_callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "cc/proxy.h"
@@ skipping 28 matching lines @@
 protected:
     virtual void initializeCompositor() = 0;
     virtual WebLayerTreeViewClient* client() = 0;
 
 public:
     virtual void SetUp()
     {
         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();
     }
 
     virtual void TearDown()
     {
         Mock::VerifyAndClearExpectations(client());
 
         m_rootLayer.reset();
         m_view.reset();
     }
 
 protected:
     scoped_ptr<WebLayer> m_rootLayer;
     scoped_ptr<WebLayerTreeViewImpl> m_view;
-    scoped_ptr<base::Thread> m_implThread;
 };
 
 class WebLayerTreeViewSingleThreadTest : public WebLayerTreeViewTestBase {
 protected:
     void composite()
     {
         m_view->composite();
     }
 
     virtual void initializeCompositor() OVERRIDE
     {
     }
 
     virtual WebLayerTreeViewClient* client() OVERRIDE
     {
         return &m_client;
     }
 
     MockWebLayerTreeViewClient m_client;
 };
 
 class WebLayerTreeViewThreadedTest : public WebLayerTreeViewTestBase {
 protected:
     virtual ~WebLayerTreeViewThreadedTest()
     {
+        cc::Proxy::setImplThread(0);
     }
 
     void composite()
     {
         m_view->setNeedsRedraw();
         base::CancelableClosure timeout(base::Bind(&MessageLoop::Quit, base::Unretained(MessageLoop::current())));
         MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                                 timeout.callback(),
                                                 base::TimeDelta::FromSeconds(5));
         MessageLoop::current()->Run();
         m_view->finishAllRendering();
     }
 
     virtual void initializeCompositor() OVERRIDE
     {
         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
     {
         return &m_client;
     }
 
     MockWebLayerTreeViewClientForThreadedTests m_client;
+    scoped_ptr<base::Thread> m_implThread;
+    scoped_ptr<cc::Thread> m_implCCThread;
     base::CancelableClosure m_timeout;
 };
 
 TEST_F(WebLayerTreeViewSingleThreadTest, InstrumentationCallbacks)
 {
     ::testing::InSequence dummy;
 
     EXPECT_CALL(m_client, willCommit());
     EXPECT_CALL(m_client, didCommit());
     EXPECT_CALL(m_client, didBeginFrame());
 
     composite();
 }
 
 TEST_F(WebLayerTreeViewThreadedTest, InstrumentationCallbacks)
 {
     ::testing::InSequence dummy;
 
     EXPECT_CALL(m_client, willBeginFrame());
     EXPECT_CALL(m_client, willCommit());
     EXPECT_CALL(m_client, didCommit());
     EXPECT_CALL(m_client, didBeginFrame());
 
     composite();
 }
 
 } // namespace