Use WeakPtr for posting cc tasks to main thread

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/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_host_impl.h"
-#include "cc/scoped_thread_proxy.h"
+#include "cc/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegate.h"
 
 namespace cc {
 class LayerImpl;
 class LayerTreeHost;
 class LayerTreeHostClient;
 class LayerTreeHostImpl;
-class Thread;
-
 
 // Used by test stubs to notify the test when something interesting happens.
 class TestHooks : public WebKit::WebAnimationDelegate {
 public:
     virtual void beginCommitOnThread(LayerTreeHostImpl*) { }
     virtual void commitCompleteOnThread(LayerTreeHostImpl*) { }
     virtual bool prepareToDrawOnThread(LayerTreeHostImpl*);
     virtual void drawLayersOnThread(LayerTreeHostImpl*) { }
     virtual void animateLayers(LayerTreeHostImpl*, base::TimeTicks monotonicTime) { }
     virtual void willAnimateLayers(LayerTreeHostImpl*, base::TimeTicks monotonicTime) { }
@@ skipping 34 matching lines @@
 public:
     virtual ~ThreadedTest();
 
     virtual void afterTest() = 0;
     virtual void beginTest() = 0;
     virtual void setupTree();
 
     void endTest();
     void endTestAfterDelay(int delayMilliseconds);
 
-    void postSetNeedsAnimateToMainThread();
     void postAddAnimationToMainThread(Layer*);
     void postAddInstantAnimationToMainThread();
     void postSetNeedsCommitToMainThread();
     void postAcquireLayerTextures();
     void postSetNeedsRedrawToMainThread();
     void postSetVisibleToMainThread(bool visible);
     void postDidAddAnimationToMainThread();
 
     void doBeginTest();
     void timeout();
 
     LayerTreeHost* layerTreeHost() { return m_layerTreeHost.get(); }
 
 protected:
     ThreadedTest();
 
     virtual void initializeSettings(LayerTreeSettings&) { }
 
     virtual void scheduleComposite() OVERRIDE;
 
     void realEndTest();
 
-    void dispatchSetNeedsAnimate();
     void dispatchAddInstantAnimation();
     void dispatchAddAnimation(Layer*);
     void dispatchSetNeedsCommit();
     void dispatchAcquireLayerTextures();
     void dispatchSetNeedsRedraw();
     void dispatchSetVisible(bool);
     void dispatchComposite();
     void dispatchDidAddAnimation();
 
     virtual void runTest(bool threaded);
 
     Thread* implThread() { return proxy() ? proxy()->implThread() : 0; }
     Proxy* proxy() const { return m_layerTreeHost ? m_layerTreeHost->proxy() : 0; }
 
     LayerTreeSettings m_settings;
     scoped_ptr<MockLayerImplTreeHostClient> m_client;
     scoped_ptr<LayerTreeHost> m_layerTreeHost;
 
-protected:
-    scoped_refptr<ScopedThreadProxy> m_mainThreadProxy;
-
 private:
     bool m_beginning;
     bool m_endWhenBeginReturns;
     bool m_timedOut;
     bool m_scheduled;
     bool m_started;
 
     scoped_ptr<Thread> m_mainCCThread;
     scoped_ptr<base::Thread> m_implThread;
     base::CancelableClosure m_timeout;
+    base::WeakPtr<ThreadedTest> m_mainThreadWeakPtr;
+    base::WeakPtrFactory<ThreadedTest> m_weakFactory;
 };
 
 class ThreadedTestThreadOnly : public ThreadedTest {
 public:
     void runTestThreaded()
     {
         ThreadedTest::runTest(true);
     }
 };
 
@@ skipping 32 matching lines @@
     TEST_F(TEST_FIXTURE_NAME, runMultiThread) \
     { \
         runTest(true); \
     }
 
 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
     SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME) \
     MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
 
 #endif  // CC_TEST_LAYER_TREE_TEST_COMMON_H_