Remove WebKit::Platform dependencies 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"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/scoped_thread_proxy.h"
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebAnimationDelegate.h>
-#include <public/WebThread.h>
 
 namespace cc {
 class LayerImpl;
 class LayerTreeHost;
 class LayerTreeHostClient;
 class LayerTreeHostImpl;
+class Thread;
 }
 
 namespace WebKitTests {
 
 // Used by test stubs to notify the test when something interesting happens.
 class TestHooks : public WebKit::WebAnimationDelegate {
 public:
     virtual void beginCommitOnThread(cc::LayerTreeHostImpl*) { }
     virtual void commitCompleteOnThread(cc::LayerTreeHostImpl*) { }
     virtual bool prepareToDrawOnThread(cc::LayerTreeHostImpl*);
@@ skipping 49 matching lines @@
     void postSetNeedsCommitToMainThread();
     void postAcquireLayerTextures();
     void postSetNeedsRedrawToMainThread();
     void postSetNeedsAnimateAndCommitToMainThread();
     void postSetVisibleToMainThread(bool visible);
     void postDidAddAnimationToMainThread();
 
     void doBeginTest();
     void timeout();
 
-    void clearTimeout() { m_timeoutTask = 0; }
-
     cc::LayerTreeHost* layerTreeHost() { return m_layerTreeHost.get(); }
 
 protected:
     ThreadedTest();
 
     virtual void initializeSettings(cc::LayerTreeSettings&) { }
 
     virtual void scheduleComposite() OVERRIDE;
 
     void realEndTest();
 
     void dispatchSetNeedsAnimate();
     void dispatchAddInstantAnimation();
     void dispatchAddAnimation();
     void dispatchSetNeedsAnimateAndCommit();
     void dispatchSetNeedsCommit();
     void dispatchAcquireLayerTextures();
     void dispatchSetNeedsRedraw();
     void dispatchSetVisible(bool);
     void dispatchComposite();
     void dispatchDidAddAnimation();
 
     virtual void runTest(bool threaded);
-    WebKit::WebThread* webThread() const { return m_webThread.get(); }
+
+    cc::Thread* implThread() { return m_implCCThread.get(); }
 
     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<WebKit::WebThread> m_webThread;
-    TimeoutTask* m_timeoutTask;
-    BeginTask* m_beginTask;
+    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);
     }
 };
 
@@ skipping 53 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_