cc: Clean up LayerTreeTest and TestHooks.

cc/trees/layer_tree_host_unittest_context.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 1551 matching lines @@
 SINGLE_AND_MULTI_THREAD_TEST_F(UIResourceLostEviction);
 
 class LayerTreeHostContextTestLoseAfterSendingBeginMainFrame
     : public LayerTreeHostContextTest {
  protected:
   void BeginTest() override {
     deferred_ = false;
     PostSetNeedsCommitToMainThread();
   }
 
-  void ScheduledActionWillSendBeginMainFrame() override {
+  void WillBeginMainFrame() override {
+    // Don't begin a frame with a lost surface.
+    EXPECT_FALSE(layer_tree_host()->output_surface_lost());
+
     if (deferred_)
       return;
     deferred_ = true;
 
-    // Defer commits before the BeginFrame arrives, causing it to be delayed.
-    PostSetDeferCommitsToMainThread(true);
+    // Defer commits before the BeginFrame completes, causing it to be delayed.
+    layer_tree_host()->SetDeferCommits(true);
     // Meanwhile, lose the context while we are in defer commits.
     ImplThreadTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&LayerTreeHostContextTestLoseAfterSendingBeginMainFrame::
                        LoseContextOnImplThread,
                    base::Unretained(this)));
   }
 
   void LoseContextOnImplThread() {
     LoseContext();
 
     // After losing the context, stop deferring commits.
     PostSetDeferCommitsToMainThread(false);
   }
 
-  void WillBeginMainFrame() override {
-    // Don't begin a frame with a lost surface.
-    EXPECT_FALSE(layer_tree_host()->output_surface_lost());
-  }
-
   void DidCommitAndDrawFrame() override { EndTest(); }
 
   void AfterTest() override {}
 
   bool deferred_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
 
 }  // namespace
 }  // namespace cc