cc: remove flaky LayerTreeHostTestFinishAllRendering

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index d1b518b44c8b1e250437f3be03c9eea062728c81..8340a717f266e512f2eba5e0ec582d1bcd2ae20b 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1528,7 +1528,9 @@ SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
 
 class LayerTreeHostTestFinishAllRendering : public LayerTreeHostTest {
  public:
-  LayerTreeHostTestFinishAllRendering() : once_(false), draw_count_(0) {}
+  LayerTreeHostTestFinishAllRendering()
+      : once_(false),
+        has_called_finish_all_rendering_(false) {}
 
   virtual void BeginTest() OVERRIDE {
     layer_tree_host()->SetNeedsRedraw();
@@ -1536,33 +1538,24 @@ class LayerTreeHostTestFinishAllRendering : public LayerTreeHostTest {
   }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    if (once_)
-      return;
-    once_ = true;
-    layer_tree_host()->SetNeedsRedraw();
-    {
-      base::AutoLock lock(lock_);
-      draw_count_ = 0;
-    }
+    EXPECT_TRUE(once_);
     layer_tree_host()->FinishAllRendering();
-    {
-      base::AutoLock lock(lock_);
-      EXPECT_EQ(0, draw_count_);

[danakj, 2014/05/20 18:40:30]

Hm, before this test was verifying that FinishAllRendering() (when needs-redraw
is true) does not end up doing a draw.

After this change, the test doesn't really verify anything except that
DidCommitAndDrawFrame happens after DrawLayersOnThread, and that
FinishAllRendering doesn't crash.

This test was added in https://bugs.webkit.org/show_bug.cgi?id=86919 to verify
that we don't draw during FinishAllRendering to not have bad interaction with
acquire layer textures. The latter no longer exists, and I'm not sure how to
test this well without it being flaky, and the finish all rendering code path no
longer goes anywhere near drawing.

I propose we remove this test.

-    }
+    has_called_finish_all_rendering_ = true;
+
     EndTest();
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE {
-    base::AutoLock lock(lock_);
-    ++draw_count_;
+    once_ = true;
   }
 
-  virtual void AfterTest() OVERRIDE {}
+  virtual void AfterTest() OVERRIDE {
+    EXPECT_TRUE(has_called_finish_all_rendering_);
+  }
 
  private:
   bool once_;
-  base::Lock lock_;
-  int draw_count_;
+  bool has_called_finish_all_rendering_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestFinishAllRendering);