cc: Control activation from the Scheduler

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 3191e5b7ab21a8064e7f868f39a87b66ad1a4796..55534c07e3aa369e9c455f840688d7869a3dbc2e 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -31,8 +31,11 @@ class TestHooks : public AnimationDelegate {
 
   void ReadSettings(const LayerTreeSettings& settings);
 
+  virtual void WillBeginFrameOnThread(LayerTreeHostImpl* host_impl,
+                                      const BeginFrameArgs& args) {}
   virtual void BeginCommitOnThread(LayerTreeHostImpl* host_impl) {}
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) {}
+  virtual void BlockNotifyReadyToActivate(bool block) = 0;
   virtual void WillActivateTreeOnThread(LayerTreeHostImpl* host_impl) {}
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) {}
   virtual void InitializedRendererOnThread(LayerTreeHostImpl* host_impl,
@@ -64,8 +67,6 @@ class TestHooks : public AnimationDelegate {
   virtual void DidCompleteSwapBuffers() {}
   virtual void ScheduleComposite() {}
   virtual void DidDeferCommit() {}
-  virtual bool CanActivatePendingTree(LayerTreeHostImpl* host_impl);
-  virtual bool CanActivatePendingTreeIfNeeded(LayerTreeHostImpl* host_impl);
   virtual void DidSetVisibleOnImplTree(LayerTreeHostImpl* host_impl,
                                        bool visible) {}
 
@@ -82,6 +83,7 @@ class TestHooks : public AnimationDelegate {
 
 class BeginTask;
 class LayerTreeHostClientForTesting;
+class LayerTreeHostImplClientInterposer;
 class TimeoutTask;
 
 // The LayerTreeTests runs with the main loop running. It instantiates a single
@@ -156,6 +158,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   bool delegating_renderer() const { return delegating_renderer_; }
   FakeOutputSurface* output_surface() { return output_surface_; }
 
+  virtual void BlockNotifyReadyToActivate(bool block) OVERRIDE;
   virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) OVERRIDE;
   virtual scoped_refptr<cc::ContextProvider>
   OffscreenContextProviderForMainThread() OVERRIDE;
@@ -166,6 +169,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
   LayerTreeSettings settings_;
   scoped_ptr<LayerTreeHostClientForTesting> client_;
   scoped_ptr<LayerTreeHost> layer_tree_host_;
+  scoped_ptr<LayerTreeHostImplClientInterposer> impl_client_;
   FakeOutputSurface* output_surface_;
 
   bool beginning_;