Remove static thread pointers from CC

cc/test/layer_tree_test_common.h

 // Copyright 2011 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.
 
 #ifndef CC_TEST_LAYER_TREE_TEST_COMMON_H_
 #define CC_TEST_LAYER_TREE_TEST_COMMON_H_
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
@@ skipping 96 matching lines @@
     void dispatchSetNeedsAnimateAndCommit();
     void dispatchSetNeedsCommit();
     void dispatchAcquireLayerTextures();
     void dispatchSetNeedsRedraw();
     void dispatchSetVisible(bool);
     void dispatchComposite();
     void dispatchDidAddAnimation();
 
     virtual void runTest(bool threaded);
 
-    cc::Thread* implThread() { return m_implCCThread.get(); }
+    cc::Thread* implThread() { return proxy() ? proxy()->implThread() : 0; }
+    cc::Proxy* proxy() const { return m_layerTreeHost ? m_layerTreeHost->proxy() : 0; }
 
     cc::LayerTreeSettings m_settings;
     scoped_ptr<MockLayerImplTreeHostClient> m_client;
     scoped_ptr<cc::LayerTreeHost> m_layerTreeHost;
 
 protected:
     scoped_refptr<cc::ScopedThreadProxy> m_mainThreadProxy;
 
 private:
     bool m_beginning;
     bool m_endWhenBeginReturns;
     bool m_timedOut;
     bool m_finished;
     bool m_scheduled;
     bool m_started;
 
     scoped_ptr<cc::Thread> m_mainCCThread;
-    scoped_ptr<cc::Thread> m_implCCThread;
     scoped_ptr<base::Thread> m_implThread;
     base::CancelableClosure m_timeout;
 };
 
 class ThreadedTestThreadOnly : public ThreadedTest {
 public:
     void runTestThreaded()
     {
         ThreadedTest::runTest(true);
     }
 };
 
 // Adapts LayerTreeHostImpl for test. Runs real code, then invokes test hooks.
 class MockLayerTreeHostImpl : public cc::LayerTreeHostImpl {
 public:
-    static scoped_ptr<MockLayerTreeHostImpl> create(TestHooks*, const cc::LayerTreeSettings&, cc::LayerTreeHostImplClient*);
+    static scoped_ptr<MockLayerTreeHostImpl> create(TestHooks*, const cc::LayerTreeSettings&, cc::LayerTreeHostImplClient*, cc::Proxy*);
 
     virtual void beginCommit() OVERRIDE;
     virtual void commitComplete() OVERRIDE;
     virtual bool prepareToDraw(FrameData&) OVERRIDE;
     virtual void drawLayers(const FrameData&) OVERRIDE;
 
     // Make these public.
     typedef std::vector<cc::LayerImpl*> LayerList;
     using LayerTreeHostImpl::calculateRenderSurfaceLayerList;
 
 protected:
     virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime) OVERRIDE;
     virtual base::TimeDelta lowFrequencyAnimationInterval() const OVERRIDE;
 
 private:
-    MockLayerTreeHostImpl(TestHooks*, const cc::LayerTreeSettings&, cc::LayerTreeHostImplClient*);
+    MockLayerTreeHostImpl(TestHooks*, const cc::LayerTreeSettings&, cc::LayerTreeHostImplClient*, cc::Proxy*);
 
     TestHooks* m_testHooks;
 };
 
 class CompositorFakeWebGraphicsContext3DWithTextureTracking : public WebKit::CompositorFakeWebGraphicsContext3D {
 public:
     static scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> create(Attributes);
     virtual ~CompositorFakeWebGraphicsContext3DWithTextureTracking();
 
     virtual WebKit::WebGLId createTexture();
@@ skipping 23 matching lines @@
     TEST_F(TEST_FIXTURE_NAME, runSingleThread)            \
     {                                                     \
         runTest(false);                                   \
     }                                                     \
     TEST_F(TEST_FIXTURE_NAME, runMultiThread)             \
     {                                                     \
         runTest(true);                                    \
     }
 
 #endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_