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 814260f72b41e370500bc0545e3d2ae06dd6d0fb..bbcb0de90812924edaf480e4e3c761dd3c0d2c6d 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -142,9 +142,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++;
         }
 
@@ -156,7 +156,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++;
         }
@@ -583,7 +583,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());
     }
@@ -638,7 +638,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
@@ -653,7 +653,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
@@ -669,7 +669,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());
     }
@@ -688,7 +688,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());
     }
 
@@ -709,7 +709,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));
     }
 }
@@ -744,7 +744,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));
     }
 
@@ -760,7 +760,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));
     }
@@ -796,7 +796,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());
     }
 }