cc: Adding DidFinishImplFrame to LTHI.

cc/test/layer_tree_test.cc

Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 055d0817d30466ff13be525e2b5edc9dedb5bd5a..e782f08f845dcbdf0a094aa8b50715124468ac45 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -81,11 +81,6 @@ class ThreadProxyForTest : public ThreadProxy {
  private:
   TestHooks* test_hooks_;
 
-  void WillBeginImplFrame(const BeginFrameArgs& args) override {
-    ThreadProxy::WillBeginImplFrame(args);
-    test_hooks_->WillBeginImplFrame(args);
-  }
-
   void ScheduledActionSendBeginMainFrame() override {
     test_hooks_->ScheduledActionWillSendBeginMainFrame();
     ThreadProxy::ScheduledActionSendBeginMainFrame();
@@ -123,6 +118,11 @@ class ThreadProxyForTest : public ThreadProxy {
     test_hooks_->ScheduledActionInvalidateOutputSurface();
   }
 
+  void SendBeginMainFrameNotExpectedSoon() override {
+    ThreadProxy::SendBeginMainFrameNotExpectedSoon();
+    test_hooks_->SendBeginMainFrameNotExpectedSoon();
+  }
+
   ThreadProxyForTest(
       TestHooks* test_hooks,
       LayerTreeHost* host,
@@ -154,11 +154,6 @@ class SingleThreadProxyForTest : public SingleThreadProxy {
  private:
   TestHooks* test_hooks_;
 
-  void WillBeginImplFrame(const BeginFrameArgs& args) override {
-    SingleThreadProxy::WillBeginImplFrame(args);
-    test_hooks_->WillBeginImplFrame(args);
-  }
-
   void ScheduledActionSendBeginMainFrame() override {
     test_hooks_->ScheduledActionWillSendBeginMainFrame();
     SingleThreadProxy::ScheduledActionSendBeginMainFrame();
@@ -192,6 +187,16 @@ class SingleThreadProxyForTest : public SingleThreadProxy {
     test_hooks_->ScheduledActionPrepareTiles();
   }
 
+  void ScheduledActionInvalidateOutputSurface() override {
+    SingleThreadProxy::ScheduledActionInvalidateOutputSurface();
+    test_hooks_->ScheduledActionInvalidateOutputSurface();
+  }
+
+  void SendBeginMainFrameNotExpectedSoon() override {
+    SingleThreadProxy::SendBeginMainFrameNotExpectedSoon();
+    test_hooks_->SendBeginMainFrameNotExpectedSoon();
+  }
+
   SingleThreadProxyForTest(
       TestHooks* test_hooks,
       LayerTreeHost* host,
@@ -255,6 +260,11 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
     test_hooks_->WillBeginImplFrameOnThread(this, args);
   }
 
+  void DidFinishImplFrame() override {
+    LayerTreeHostImpl::DidFinishImplFrame();
+    test_hooks_->DidFinishImplFrameOnThread(this);
+  }
+
   void BeginMainFrameAborted(CommitEarlyOutReason reason) override {
     LayerTreeHostImpl::BeginMainFrameAborted(reason);
     test_hooks_->BeginMainFrameAbortedOnThread(this, reason);
@@ -712,6 +722,7 @@ void LayerTreeTest::Timeout() {
 }
 
 void LayerTreeTest::RealEndTest() {
+  // TODO(mithro): Make this method only end when not inside an impl frame.
   if (layer_tree_host_ && !timed_out_ &&
       proxy()->MainFrameWillHappenForTesting()) {
     main_task_runner_->PostTask(