[not for review - epic CL] Adding Elastic+Momentum+Layered scrolling to views::ScrollView

cc/trees/property_tree_unittest.cc

Index: cc/trees/property_tree_unittest.cc
diff --git a/cc/trees/property_tree_unittest.cc b/cc/trees/property_tree_unittest.cc
index 71d6a889bab001d2f8367ff415ed162d17a64a5f..77c7a9f7130362ddf36e1ecaf5c5b6d34bf4482d 100644
--- a/cc/trees/property_tree_unittest.cc
+++ b/cc/trees/property_tree_unittest.cc
@@ -45,7 +45,7 @@ TEST(PropertyTreeSerializationTest, TransformNodeSerialization) {
   original.in_subtree_of_page_scale_layer = false;
   original.post_local_scale_factor = 0.5f;
   original.surface_contents_scale = gfx::Vector2dF(0.5f, 0.5f);
-  original.scroll_offset = gfx::ScrollOffset(1.5f, 1.5f);
+  original.scroll_offset_with_overscroll = gfx::ScrollOffset(1.5f, 1.5f);
   original.scroll_snap = gfx::Vector2dF(0.4f, 0.4f);
   original.source_offset = gfx::Vector2dF(2.5f, 2.4f);
   original.source_to_parent = gfx::Vector2dF(3.2f, 3.2f);
@@ -250,11 +250,14 @@ TEST(PropertyTreeSerializationTest, ScrollTreeSerialization) {
   third.owner_id = 20;
   third.contains_non_fast_scrollable_region = true;
 
+  const gfx::ScrollOffset offset(1, 2);
+  const gfx::ScrollOffset overscroll(3, 4);
+
   original.Insert(second, 0);
   original.Insert(third, 1);
 
   original.set_currently_scrolling_node(1);
-  original.SetScrollOffset(1, gfx::ScrollOffset(1, 2));
+  original.SetScrollOffset(1, offset, overscroll);
 
   proto::PropertyTree proto;
   original.ToProtobuf(&proto);
@@ -268,7 +271,7 @@ TEST(PropertyTreeSerializationTest, ScrollTreeSerialization) {
 
   original.clear();
   original.set_currently_scrolling_node(0);
-  original.SetScrollOffset(2, gfx::ScrollOffset(1, 2));
+  original.SetScrollOffset(2, offset, overscroll);
 
   proto::PropertyTree proto2;
   original.ToProtobuf(&proto2);