[NOT LANDED] Revert of 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 ea509d5f81e12cc3781c62375d6c196cbd912dcf..d727ae61700d8fa8e346b170457fdc358a64aa9b 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -9,9 +9,6 @@
 #include "base/threading/thread.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/layers/layer_settings.h"
-#include "cc/test/proxy_impl_for_test.h"
-#include "cc/test/proxy_main_for_test.h"
-#include "cc/test/test_hooks.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -48,6 +45,130 @@
                                  const gfx::Size& scroll_bounds,
                                  LayerTreeHost* host,
                                  const LayerSettings& layer_settings);
+
+// Used by test stubs to notify the test when something interesting happens.
+class TestHooks : public AnimationDelegate {
+ public:
+  TestHooks();
+  ~TestHooks() override;
+
+  void ReadSettings(const LayerTreeSettings& settings);
+
+  virtual void CreateResourceAndTileTaskWorkerPool(
+      LayerTreeHostImpl* host_impl,
+      scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
+      scoped_ptr<ResourcePool>* resource_pool);
+  virtual void WillBeginImplFrameOnThread(LayerTreeHostImpl* host_impl,
+                                          const BeginFrameArgs& args) {}
+  virtual void DidFinishImplFrameOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void BeginMainFrameAbortedOnThread(LayerTreeHostImpl* host_impl,
+                                             CommitEarlyOutReason reason) {}
+  virtual void WillPrepareTiles(LayerTreeHostImpl* host_impl) {}
+  virtual void BeginCommitOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void WillCommitCompleteOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void WillActivateTreeOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void InitializedRendererOnThread(LayerTreeHostImpl* host_impl,
+                                           bool success) {}
+  virtual DrawResult PrepareToDrawOnThread(
+      LayerTreeHostImpl* host_impl,
+      LayerTreeHostImpl::FrameData* frame_data,
+      DrawResult draw_result);
+  virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) {}
+  virtual void SwapBuffersCompleteOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void NotifyReadyToActivateOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void NotifyReadyToDrawOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void NotifyAllTileTasksCompleted(LayerTreeHostImpl* host_impl) {}
+  virtual void NotifyTileStateChangedOnThread(LayerTreeHostImpl* host_impl,
+                                              const Tile* tile) {}
+  virtual void AnimateLayers(LayerTreeHostImpl* host_impl,
+                             base::TimeTicks monotonic_time) {}
+  virtual void UpdateAnimationState(LayerTreeHostImpl* host_impl,
+                                    bool has_unfinished_animation) {}
+  virtual void WillAnimateLayers(LayerTreeHostImpl* host_impl,
+                                 base::TimeTicks monotonic_time) {}
+  virtual void ApplyViewportDeltas(
+      const gfx::Vector2dF& inner_delta,
+      const gfx::Vector2dF& outer_delta,
+      const gfx::Vector2dF& elastic_overscroll_delta,
+      float scale,
+      float top_controls_delta) {}
+  virtual void BeginMainFrame(const BeginFrameArgs& args) {}
+  virtual void WillBeginMainFrame() {}
+  virtual void DidBeginMainFrame() {}
+  virtual void UpdateLayerTreeHost() {}
+  virtual void DidInitializeOutputSurface() {}
+  virtual void DidFailToInitializeOutputSurface() {}
+  virtual void DidAddAnimation() {}
+  virtual void WillCommit() {}
+  virtual void DidCommit() {}
+  virtual void DidCommitAndDrawFrame() {}
+  virtual void DidCompleteSwapBuffers() {}
+  virtual void DidSetVisibleOnImplTree(LayerTreeHostImpl* host_impl,
+                                       bool visible) {}
+  virtual void ScheduleComposite() {}
+  virtual void DidSetNeedsUpdateLayers() {}
+  virtual void DidActivateSyncTree() {}
+
+  // Hooks for SchedulerClient.
+  virtual void ScheduledActionWillSendBeginMainFrame() {}
+  virtual void ScheduledActionSendBeginMainFrame() {}
+  virtual void ScheduledActionDrawAndSwapIfPossible() {}
+  virtual void ScheduledActionCommit() {}
+  virtual void ScheduledActionBeginOutputSurfaceCreation() {}
+  virtual void ScheduledActionPrepareTiles() {}
+  virtual void ScheduledActionInvalidateOutputSurface() {}
+  virtual void SendBeginFramesToChildren(const BeginFrameArgs& args) {}
+  virtual void SendBeginMainFrameNotExpectedSoon() {}
+
+  // Hooks for ProxyImpl
+  virtual void SetThrottleFrameProductionOnImpl(bool throttle) {}
+  virtual void UpdateTopControlsStateOnImpl(TopControlsState constraints,
+                                            TopControlsState current,
+                                            bool animate) {}
+  virtual void InitializeOutputSurfaceOnImpl(OutputSurface* output_surface) {}
+  virtual void MainThreadHasStoppedFlingingOnImpl() {}
+  virtual void SetInputThrottledUntilCommitOnImpl(bool is_throttled) {}
+  virtual void SetDeferCommitsOnImpl(bool defer_commits) {}
+  virtual void BeginMainFrameAbortedOnImpl(CommitEarlyOutReason reason) {}
+  virtual void SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect) {}
+  virtual void SetNeedsCommitOnImpl() {}
+  virtual void FinishAllRenderingOnImpl() {}
+  virtual void SetVisibleOnImpl(bool visible) {}
+  virtual void ReleaseOutputSurfaceOnImpl() {}
+  virtual void FinishGLOnImpl() {}
+  virtual void StartCommitOnImpl() {}
+  virtual void InitializeImplOnImpl() {}
+  virtual void WillCloseLayerTreeHostOnImpl() {}
+
+  // Hooks for ProxyMain
+  virtual void ReceivedDidCompleteSwapBuffers() {}
+  virtual void ReceivedSetRendererCapabilitiesMainCopy(
+      const RendererCapabilities& capabilities) {}
+  virtual void ReceivedBeginMainFrameNotExpectedSoon() {}
+  virtual void ReceivedDidCommitAndDrawFrame() {}
+  virtual void ReceivedSetAnimationEvents() {}
+  virtual void ReceivedDidLoseOutputSurface() {}
+  virtual void ReceivedRequestNewOutputSurface() {}
+  virtual void ReceivedDidInitializeOutputSurface(
+      bool success,
+      const RendererCapabilities& capabilities) {}
+  virtual void ReceivedDidCompletePageScaleAnimation() {}
+  virtual void ReceivedPostFrameTimingEventsOnMain() {}
+  virtual void ReceivedBeginMainFrame() {}
+
+  // Implementation of AnimationDelegate:
+  void NotifyAnimationStarted(base::TimeTicks monotonic_time,
+                              Animation::TargetProperty target_property,
+                              int group) override {}
+  void NotifyAnimationFinished(base::TimeTicks monotonic_time,
+                               Animation::TargetProperty target_property,
+                               int group) override {}
+
+  virtual void RequestNewOutputSurface() = 0;
+};
 
 class BeginTask;
 class LayerTreeHostClientForTesting;
@@ -129,10 +250,9 @@
   virtual void BeginTest() = 0;
   virtual void SetupTree();
 
-  // TODO(khushalsagar): Add mode for running remote channel tests.
   virtual void RunTest(CompositorMode mode, bool delegating_renderer);
 
-  bool HasImplThread() const { return !!impl_thread_; }
+  bool HasImplThread() { return !!impl_thread_; }
   base::SingleThreadTaskRunner* ImplThreadTaskRunner() {
     DCHECK(task_runner_provider());
     base::SingleThreadTaskRunner* impl_thread_task_runner =
@@ -157,12 +277,6 @@
   bool delegating_renderer() const { return delegating_renderer_; }
   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.
-  ProxyMainForTest* GetProxyMainForTest() const;
-  ProxyImplForTest* GetProxyImplForTest() const;
 
   void DestroyLayerTreeHost();