cc: Split ThreadProxy into ProxyMain and ProxyImpl

cc/test/layer_tree_test.h

Index: cc/test/layer_tree_test.h
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 0c2dfb103a4485bf0765a5fac70019956811dc8d..ad78ffaef9ef9f9fc1089200961a139c1a9ee099 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -21,6 +21,8 @@ class LayerImpl;
 class LayerTreeHost;
 class LayerTreeHostClient;
 class LayerTreeHostImpl;
+class ProxyMain;
+class ProxyImpl;
 class TestContextProvider;
 class TestGpuMemoryBufferManager;
 class TestWebGraphicsContext3D;
@@ -139,8 +141,6 @@ class TestHooks : public AnimationDelegate {
   virtual void ReleaseOutputSurfaceOnImpl() {}
   virtual void FinishGLOnImpl() {}
   virtual void StartCommitOnImpl() {}
-  virtual void InitializeImplOnImpl() {}
-  virtual void WillCloseLayerTreeHostOnImpl() {}
 
   // Hooks for ProxyMain
   virtual void ReceivedDidCompleteSwapBuffers() {}
@@ -249,9 +249,10 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   virtual void BeginTest() = 0;
   virtual void SetupTree();
 
+  // TODO(khushalsagar): Add mode for running remote channel tests.
   virtual void RunTest(bool threaded, bool delegating_renderer);
 
-  bool HasImplThread() { return !!impl_thread_; }
+  bool HasImplThread() const { return !!impl_thread_; }
   base::SingleThreadTaskRunner* ImplThreadTaskRunner() {
     DCHECK(task_runner_provider());
     base::SingleThreadTaskRunner* impl_thread_task_runner =
@@ -280,6 +281,12 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   FakeOutputSurface* output_surface() { return output_surface_; }
   int LastCommittedSourceFrameNumber(LayerTreeHostImpl* impl) const;
 
+  // Use these only for ProxyMain tests in threaded mode.
+  // TODO(khushalsagar): Update these when adding support for remote channel
+  // tests.
+  ProxyMain* GetProxyMain() const;
+  ProxyImpl* GetProxyImpl() const;
+
   void DestroyLayerTreeHost();
 
   // By default, output surface recreation is synchronous.