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..c788ef5ed28507b5279957188ff2c73319be0bb2 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)

[danakj, 2016/07/13 21:50:18]

This just isn't called if result was false. So we stop tracking the old
"did_swaps_", and EXPECT on the has_no_damage at prepare-to-draw time instead.

-      ++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);
@@ -410,9 +407,8 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
     return draw_result;
   }
 
-  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
+  void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
     ++did_swaps_;
-    EXPECT_TRUE(result);
     LayerImpl* scroll_layer =
         host_impl->active_tree()->LayerById(content_layer_->id());
     switch (did_swaps_) {
@@ -497,9 +493,8 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
     return draw_result;
   }
 
-  void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
+  void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
     ++did_swaps_;
-    EXPECT_TRUE(result);
     LayerImpl* scroll_layer =
         host_impl->active_tree()->LayerById(content_layer_->id());
     switch (did_swaps_) {