Revert 168254 - Merge 167537 - Use message passing for BeginFrameAndCommitState and clean up forced…

cc/layer_tree_host_unittest.cc

 // Copyright 2011 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 "config.h"
 
 #include "cc/layer_tree_host.h"
 
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
@@ skipping 2499 matching lines @@
         endTest();
     }
 
     virtual void afterTest() OVERRIDE
     {
     }
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestCompositeAndReadbackCleanup)
 
-class LayerTreeHostTestCompositeAndReadbackAnimateCount : public LayerTreeHostTest {
-public:
-    LayerTreeHostTestCompositeAndReadbackAnimateCount()
-        : m_layoutCount(0)
-    {
-    }
-
-    virtual void animate(base::TimeTicks) OVERRIDE
-    {
-        // We shouldn't animate on the compositeAndReadback-forced commit, but we should
-        // for the setNeedsCommit-triggered commit.
-        EXPECT_EQ(1, m_layoutCount);
-    }
-
-    virtual void layout() OVERRIDE
-    {
-        m_layoutCount++;
-        if (m_layoutCount == 2)
-            endTest();
-    }
-
-    virtual void beginTest() OVERRIDE
-    {
-        m_layerTreeHost->setNeedsCommit();
-
-        char pixels[4];
-        m_layerTreeHost->compositeAndReadback(&pixels, WebCore::IntRect(0, 0, 1, 1));
-    }
-
-    virtual void afterTest() OVERRIDE
-    {
-    }
-
-private:
-    int m_layoutCount;
-};
-
-TEST_F(LayerTreeHostTestCompositeAndReadbackAnimateCount, runMultiThread)
-{
-    runTest(true);
-}
-
 class LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit : public LayerTreeHostTest {
 public:
     LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit()
         : m_rootLayer(ContentLayerWithUpdateTracking::create(&m_mockDelegate))
         , m_surfaceLayer1(ContentLayerWithUpdateTracking::create(&m_mockDelegate))
         , m_replicaLayer1(ContentLayerWithUpdateTracking::create(&m_mockDelegate))
         , m_surfaceLayer2(ContentLayerWithUpdateTracking::create(&m_mockDelegate))
         , m_replicaLayer2(ContentLayerWithUpdateTracking::create(&m_mockDelegate))
     {
     }
@@ skipping 697 matching lines @@
     int m_numCommitsDeferred;
     int m_numCompleteCommits;
 };
 
 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread)
 {
     runTest(true);
 }
 
 } // namespace