cc: Fix CCLayerTreeHostTestScrollMultipleRedraw.runMultiThread test.

cc/CCLayerTreeHostTest.cpp

 // 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 "CCLayerTreeHost.h"
 
 #include "CCGeometryTestUtils.h"
 #include "CCGraphicsContext.h"
@@ skipping 951 matching lines @@
     virtual void beginTest() OVERRIDE
     {
         m_layerTreeHost->rootLayer()->setScrollable(true);
         m_layerTreeHost->rootLayer()->setScrollPosition(m_initialScroll);
         postSetNeedsCommitToMainThread();
     }
 
     virtual void beginCommitOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
     {
         LayerChromium* root = m_layerTreeHost->rootLayer();
-        if (!impl->sourceFrameNumber())
+        if (!m_layerTreeHost->commitNumber())
             EXPECT_EQ(root->scrollPosition(), m_initialScroll);
-        else if (impl->sourceFrameNumber() == 1)
+        else if (m_layerTreeHost->commitNumber() == 1)
             EXPECT_EQ(root->scrollPosition(), m_initialScroll + m_scrollAmount + m_scrollAmount);
-        else if (impl->sourceFrameNumber() == 2)
+        else if (m_layerTreeHost->commitNumber() == 2)
             EXPECT_EQ(root->scrollPosition(), m_initialScroll + m_scrollAmount + m_scrollAmount);
     }
 
     virtual void drawLayersOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
     {
         CCLayerImpl* root = impl->rootLayer();
         root->setScrollable(true);
         root->setMaxScrollPosition(IntSize(100, 100));
 
         if (!impl->sourceFrameNumber() && impl->sourceAnimationFrameNumber() == 1) {
@@ skipping 31 matching lines @@
     virtual void afterTest() OVERRIDE
     {
         EXPECT_EQ(1, m_scrolls);
     }
 private:
     IntPoint m_initialScroll;
     IntSize m_scrollAmount;
     int m_scrolls;
 };
 
-TEST_F(CCLayerTreeHostTestScrollMultipleRedraw, DISABLED_runMultiThread)
+TEST_F(CCLayerTreeHostTestScrollMultipleRedraw, runMultiThread)
 {
     runTest(true);
 }
 
 // This test verifies that properties on the layer tree host are commited to the impl side.
 class CCLayerTreeHostTestCommit : public CCLayerTreeHostTest {
 public:
 
     CCLayerTreeHostTestCommit() { }
 
@@ skipping 1949 matching lines @@
     int m_numCommitComplete;
     int m_numDrawLayers;
 };
 
 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread)
 {
     runTest(true);
 }
 
 } // namespace