Remove WebKit::Platform dependencies from cc

cc/test/layer_tree_test_common.h

Index: cc/test/layer_tree_test_common.h
diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
index 3688c7193d38593933609b6a28909e6c4eb4655c..c7e5cc759a1054a81628f762ea029d3aef3a6e69 100644
--- a/cc/test/layer_tree_test_common.h
+++ b/cc/test/layer_tree_test_common.h
@@ -7,18 +7,19 @@
 
 #include "cc/layer_tree_host.h"
 #include "base/hash_tables.h"
+#include "base/threading/thread.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 {
@@ -88,8 +89,6 @@ public:
     void doBeginTest();
     void timeout();
 
-    void clearTimeout() { m_timeoutTask = 0; }
-
     cc::LayerTreeHost* layerTreeHost() { return m_layerTreeHost.get(); }
 
 protected:
@@ -113,14 +112,15 @@ protected:
     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:
-    RefPtr<cc::ScopedThreadProxy> m_mainThreadProxy;
+    scoped_refptr<cc::ScopedThreadProxy> m_mainThreadProxy;
 
 private:
     bool m_beginning;
@@ -130,9 +130,10 @@ private:
     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 {