cc: Clean up LayerTreeTest and TestHooks.

cc/trees/layer_tree_host_unittest_scroll.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 1515 matching lines @@
                                              ->scroll_clip_layer()
                                              ->id();
     layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
         initial_scroll_);
     layer_tree_host()->outer_viewport_scroll_layer()->set_did_scroll_callback(
         base::Bind(&LayerTreeHostScrollTestScrollMFBA::DidScrollOuterViewport,
                    base::Unretained(this)));
     PostSetNeedsCommitToMainThread();
   }
 
-  void StartCommitOnImpl() override {
+  void BeginMainFrameCompletedOnThread(LayerTreeHostImpl* impl) override {
     switch (num_commits_) {
       case 1:
         // Ask for commit here because activation (and draw) will be blocked.
-        GetProxyImplForTest()->SetNeedsCommitOnImpl();
+        impl->SetNeedsCommit();
         // Block activation after second commit until third commit is ready.
-        GetProxyImplForTest()->BlockNotifyReadyToActivateForTesting(true);
+        impl->BlockNotifyReadyToActivateForTesting(true);
         break;
       case 2:
         // Unblock activation after third commit is ready.
-        GetProxyImplForTest()->BlockNotifyReadyToActivateForTesting(false);
+        impl->BlockNotifyReadyToActivateForTesting(false);
         break;
     }
     num_commits_++;
   }
 
   void UpdateLayerTreeHost() override {
     Layer* scroll_layer = layer_tree_host()->outer_viewport_scroll_layer();
     switch (layer_tree_host()->source_frame_number()) {
       case 0:
         EXPECT_VECTOR_EQ(initial_scroll_, scroll_layer->scroll_offset());
@@ skipping 294 matching lines @@
   int num_impl_commits_;
   int num_aborted_commits_;
   int num_impl_scrolls_;
   int num_draws_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostScrollTestScrollAbortedCommitMFBA);
 
 }  // namespace
 }  // namespace cc