Try deflake tests, and re-enable a was-flaky test.

BUG=164309
R=jamesr
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/11450014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171376 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 26 deletions

diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index 398919b..ea6a1b9 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -1297,6 +1297,7 @@ public:
         m_childLayer->setAnchorPoint(gfx::PointF(0, 0));
 
         m_layerTreeHost->setRootLayer(m_rootLayer);
+        postSetNeedsCommitToMainThread();
     }
 
     virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE
@@ -1354,8 +1355,8 @@ public:
         childScreenSpaceTransform.Translate(3, 3);
         gfx::Transform childDrawTransform = childScreenSpaceTransform;
 
-        EXPECT_EQ(childDrawTransform, child->drawTransform());
-        EXPECT_EQ(childScreenSpaceTransform, child->screenSpaceTransform());
+        EXPECT_TRANSFORMATION_MATRIX_EQ(childDrawTransform, child->drawTransform());
+        EXPECT_TRANSFORMATION_MATRIX_EQ(childScreenSpaceTransform, child->screenSpaceTransform());
 
         endTest();
     }
@@ -1372,8 +1373,7 @@ private:
     scoped_refptr<ContentLayer> m_childLayer;
 };
 
-// Test is flaky - http://crbug.com/148490
-TEST_F(LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers, DISABLED_runMultiThread)
+TEST_F(LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers, runMultiThread)
 {
     runTest(true);
 }
@@ -1440,7 +1440,7 @@ public:
 
         if (impl->sourceFrameNumber() < 1) {
             context->resetUsedTextures();
-            postSetNeedsAnimateAndCommitToMainThread();
+            postSetNeedsCommitToMainThread();
             postSetNeedsRedrawToMainThread();
         } else
             endTest();
@@ -1566,7 +1566,7 @@ public:
 
         if (impl->sourceFrameNumber() < 4) {
             context->resetUsedTextures();
-            postSetNeedsAnimateAndCommitToMainThread();
+            postSetNeedsCommitToMainThread();
             postSetNeedsRedrawToMainThread();
         } else
             endTest();
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index ab8d901..35bdab7 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -338,11 +338,6 @@ void ThreadedTest::postSetNeedsRedrawToMainThread()
     m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchSetNeedsRedraw, base::Unretained(this)));
 }
 
-void ThreadedTest::postSetNeedsAnimateAndCommitToMainThread()
-{
-    m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchSetNeedsAnimateAndCommit, base::Unretained(this)));
-}
-
 void ThreadedTest::postSetVisibleToMainThread(bool visible)
 {
     m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchSetVisible, base::Unretained(this), visible));
@@ -431,19 +426,6 @@ void ThreadedTest::dispatchAddAnimation(Layer* layerToReceiveAnimation)
         addOpacityTransitionToLayer(*layerToReceiveAnimation, 10, 0, 0.5, true);
 }
 
-void ThreadedTest::dispatchSetNeedsAnimateAndCommit()
-{
-    DCHECK(!proxy() || proxy()->isMainThread());
-
-    if (m_finished)
-        return;
-
-    if (m_layerTreeHost.get()) {
-        m_layerTreeHost->setNeedsAnimate();
-        m_layerTreeHost->setNeedsCommit();
-    }
-}
-
 void ThreadedTest::dispatchSetNeedsCommit()
 {
     DCHECK(!proxy() || proxy()->isMainThread());
diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
index 90b3a98..4403326 100644
--- a/cc/test/layer_tree_test_common.h
+++ b/cc/test/layer_tree_test_common.h
@@ -83,7 +83,6 @@ public:
     void postSetNeedsCommitToMainThread();
     void postAcquireLayerTextures();
     void postSetNeedsRedrawToMainThread();
-    void postSetNeedsAnimateAndCommitToMainThread();
     void postSetVisibleToMainThread(bool visible);
     void postDidAddAnimationToMainThread();
 
@@ -104,7 +103,6 @@ protected:
     void dispatchSetNeedsAnimate();
     void dispatchAddInstantAnimation();
     void dispatchAddAnimation(cc::Layer*);
-    void dispatchSetNeedsAnimateAndCommit();
     void dispatchSetNeedsCommit();
     void dispatchAcquireLayerTextures();
     void dispatchSetNeedsRedraw();