cc: Chromify LayerTreeHostCommon

cc/trees/layer_tree_host_impl_unittest.cc

Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index ad27935e03ccabc9e832a23307984086f88205a0..902a29a31eee1a1afe8e56a10d24b433f4fc84bb 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -141,9 +141,9 @@ public:
         int timesEncountered = 0;
 
         for (size_t i = 0; i < scrollInfo.scrolls.size(); ++i) {
-            if (scrollInfo.scrolls[i].layerId != id)
+            if (scrollInfo.scrolls[i].layer_id != id)
                 continue;
-            EXPECT_VECTOR_EQ(scrollDelta, scrollInfo.scrolls[i].scrollDelta);
+            EXPECT_VECTOR_EQ(scrollDelta, scrollInfo.scrolls[i].scroll_delta);
             timesEncountered++;
         }
 
@@ -155,7 +155,7 @@ public:
         int timesEncountered = 0;
 
         for (size_t i = 0; i < scrollInfo.scrolls.size(); ++i) {
-            if (scrollInfo.scrolls[i].layerId != id)
+            if (scrollInfo.scrolls[i].layer_id != id)
                 continue;
             timesEncountered++;
         }
@@ -581,7 +581,7 @@ TEST_F(LayerTreeHostImplTest, implPinchZoom)
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, pageScaleDelta);
+        EXPECT_EQ(scrollInfo->page_scale_delta, pageScaleDelta);
 
         EXPECT_EQ(gfx::Vector2d(75, 75), m_hostImpl->active_tree()->root_layer()->max_scroll_offset());
     }
@@ -636,7 +636,7 @@ TEST_F(LayerTreeHostImplTest, pinchGesture)
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, pageScaleDelta);
+        EXPECT_EQ(scrollInfo->page_scale_delta, pageScaleDelta);
     }
 
     // Zoom-in clamping
@@ -651,7 +651,7 @@ TEST_F(LayerTreeHostImplTest, pinchGesture)
         m_hostImpl->PinchGestureEnd();
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, maxPageScale);
+        EXPECT_EQ(scrollInfo->page_scale_delta, maxPageScale);
     }
 
     // Zoom-out clamping
@@ -667,7 +667,7 @@ TEST_F(LayerTreeHostImplTest, pinchGesture)
         m_hostImpl->PinchGestureEnd();
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, minPageScale);
+        EXPECT_EQ(scrollInfo->page_scale_delta, minPageScale);
 
         EXPECT_TRUE(scrollInfo->scrolls.empty());
     }
@@ -686,7 +686,7 @@ TEST_F(LayerTreeHostImplTest, pinchGesture)
         m_hostImpl->PinchGestureEnd();
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, pageScaleDelta);
+        EXPECT_EQ(scrollInfo->page_scale_delta, pageScaleDelta);
         EXPECT_TRUE(scrollInfo->scrolls.empty());
     }
 
@@ -707,7 +707,7 @@ TEST_F(LayerTreeHostImplTest, pinchGesture)
         m_hostImpl->ScrollEnd();
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, pageScaleDelta);
+        EXPECT_EQ(scrollInfo->page_scale_delta, pageScaleDelta);
         expectContains(*scrollInfo, scrollLayer->id(), gfx::Vector2d(-10, -10));
     }
 }
@@ -742,7 +742,7 @@ TEST_F(LayerTreeHostImplTest, pageScaleAnimation)
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, 2);
+        EXPECT_EQ(scrollInfo->page_scale_delta, 2);
         expectContains(*scrollInfo, scrollLayer->id(), gfx::Vector2d(-50, -50));
     }
 
@@ -758,7 +758,7 @@ TEST_F(LayerTreeHostImplTest, pageScaleAnimation)
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, minPageScale);
+        EXPECT_EQ(scrollInfo->page_scale_delta, minPageScale);
         // Pushed to (0,0) via clamping against contents layer size.
         expectContains(*scrollInfo, scrollLayer->id(), gfx::Vector2d(-50, -50));
     }
@@ -794,7 +794,7 @@ TEST_F(LayerTreeHostImplTest, pageScaleAnimationNoOp)
         EXPECT_TRUE(m_didRequestCommit);
 
         scoped_ptr<ScrollAndScaleSet> scrollInfo = m_hostImpl->ProcessScrollDeltas();
-        EXPECT_EQ(scrollInfo->pageScaleDelta, 1);
+        EXPECT_EQ(scrollInfo->page_scale_delta, 1);
         expectNone(*scrollInfo, scrollLayer->id());
     }
 }