cc: Make LayerTreeHostImpl::SwapBuffers not virtual.

cc/trees/layer_tree_host_unittest_damage.cc

Index: cc/trees/layer_tree_host_unittest_damage.cc
diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
index 246f9100a8741e4477cbe1e8150a9304a9b62445..405d83731617777da1c54dde91d060458cf96364 100644
--- a/cc/trees/layer_tree_host_unittest_damage.cc
+++ b/cc/trees/layer_tree_host_unittest_damage.cc
@@ -149,9 +149,6 @@ SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDamageTestSetViewportSize);
 class LayerTreeHostDamageTestNoDamageDoesNotSwap
     : public LayerTreeHostDamageTest {
   void BeginTest() override {
-    expect_swap_and_succeed_ = 0;
-    did_swaps_ = 0;
-    did_swap_and_succeed_ = 0;
     PostSetNeedsCommitToMainThread();
   }
 
@@ -178,29 +175,31 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
     switch (source_frame) {
       case 0:
         // The first frame has damage, so we should draw and swap.
-        ++expect_swap_and_succeed_;
+        EXPECT_FALSE(frame_data->has_no_damage);
+        ++expect_swap_;
         break;
       case 1:
         // The second frame has no damage, so we should not draw and swap.
+        EXPECT_TRUE(frame_data->has_no_damage);
         break;
       case 2:
         // The third frame has damage again, so we should draw and swap.
-        ++expect_swap_and_succeed_;
+        EXPECT_FALSE(frame_data->has_no_damage);
+        ++expect_swap_;
         break;
       case 3:
         // The fourth frame has no visible damage, so we should not draw and
         // swap.
+        EXPECT_TRUE(frame_data->has_no_damage);
         EndTest();
         break;
     }
     return draw_result;
   }
 
-  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
-    ++did_swaps_;
-    if (result)
-      ++did_swap_and_succeed_;
-    EXPECT_EQ(expect_swap_and_succeed_, did_swap_and_succeed_);
+  void SwapBuffersCompleteOnThread() override {
+    ++did_swap_;
+    EXPECT_EQ(expect_swap_, did_swap_);
   }
 
   void DidCommit() override {
@@ -223,16 +222,14 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
   }
 
   void AfterTest() override {
-    EXPECT_EQ(4, did_swaps_);
-    EXPECT_EQ(2, expect_swap_and_succeed_);
-    EXPECT_EQ(expect_swap_and_succeed_, did_swap_and_succeed_);
+    EXPECT_EQ(2, expect_swap_);
+    EXPECT_EQ(expect_swap_, did_swap_);
   }
 
   FakeContentLayerClient client_;
   scoped_refptr<FakePictureLayer> content_;
-  int expect_swap_and_succeed_;
-  int did_swaps_;
-  int did_swap_and_succeed_;
+  int expect_swap_ = 0;
+  int did_swap_ = 0;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDamageTestNoDamageDoesNotSwap);
@@ -376,7 +373,7 @@ class LayerTreeHostScrollbarDamageTest : public LayerTreeHostDamageTest {
 class LayerTreeHostDamageTestScrollbarDoesDamage
     : public LayerTreeHostScrollbarDamageTest {
   void BeginTest() override {
-    did_swaps_ = 0;
+    num_draws_ = 0;
     PostSetNeedsCommitToMainThread();
   }
 
@@ -389,7 +386,7 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
     gfx::Rect root_damage =
         root_surface->damage_tracker()->current_damage_rect();
     root_damage.Intersect(root_surface->content_rect());
-    switch (did_swaps_) {
+    switch (num_draws_) {
       case 0:
         // The first frame has damage, so we should draw and swap.
         break;
@@ -410,12 +407,11 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
     return draw_result;
   }
 
-  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
-    ++did_swaps_;
-    EXPECT_TRUE(result);
+  void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
+    ++num_draws_;
     LayerImpl* scroll_layer =
         host_impl->active_tree()->LayerById(content_layer_->id());
-    switch (did_swaps_) {
+    switch (num_draws_) {
       case 1:
         // Test that modifying the position of the content layer (not
         // scrolling) won't damage the scrollbar.
@@ -440,20 +436,20 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
   }
 
   void ModifyContentLayerPosition() {
-    EXPECT_EQ(1, did_swaps_);
+    EXPECT_EQ(1, num_draws_);
     content_layer_->SetPosition(gfx::PointF(10.f, 10.f));
   }
 
   void ResizeScrollLayer() {
-    EXPECT_EQ(3, did_swaps_);
+    EXPECT_EQ(3, num_draws_);
     Layer* root = layer_tree_host()->root_layer();
     content_layer_->SetBounds(
         gfx::Size(root->bounds().width() + 60, root->bounds().height() + 100));
   }
 
-  void AfterTest() override { EXPECT_EQ(4, did_swaps_); }
+  void AfterTest() override { EXPECT_EQ(4, num_draws_); }
 
-  int did_swaps_;
+  int num_draws_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarDoesDamage);
@@ -461,7 +457,7 @@ MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarDoesDamage);
 class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
     : public LayerTreeHostScrollbarDamageTest {
   void BeginTest() override {
-    did_swaps_ = 0;
+    num_draws_ = 0;
     PostSetNeedsCommitToMainThread();
   }
 
@@ -475,7 +471,7 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
         root_surface->damage_tracker()->current_damage_rect();
     root_damage.Intersect(root_surface->content_rect());
     int frame = host_impl->active_tree()->source_frame_number();
-    switch (did_swaps_) {
+    switch (num_draws_) {
       case 0:
         // The first frame has damage, so we should draw and swap.
         EXPECT_EQ(0, frame);
@@ -497,12 +493,11 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
     return draw_result;
   }
 
-  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
-    ++did_swaps_;
-    EXPECT_TRUE(result);
+  void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
+    ++num_draws_;
     LayerImpl* scroll_layer =
         host_impl->active_tree()->LayerById(content_layer_->id());
-    switch (did_swaps_) {
+    switch (num_draws_) {
       case 1:
         // Scroll on the thread.  This should damage the scrollbar for the
         // next draw on the thread.
@@ -523,9 +518,9 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
     }
   }
 
-  void AfterTest() override { EXPECT_EQ(3, did_swaps_); }
+  void AfterTest() override { EXPECT_EQ(3, num_draws_); }
 
-  int did_swaps_;
+  int num_draws_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarCommitDoesNoDamage);