cc: Move SyncedScrollOffset to scroll tree

cc/trees/layer_tree_host_common_unittest.cc

 // 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 "cc/trees/layer_tree_host_common.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 10049 matching lines @@
   parent5->SetBounds(gfx::Size(10, 10));
 
   host()->RegisterViewportLayers(NULL, page_scale_layer, parent2, NULL);
   ExecuteCalculateDrawPropertiesWithPropertyTrees(root1.get());
 
   const int kInvalidPropertyTreeNodeId = -1;
   const int kRootPropertyTreeNodeId = 0;
 
   // Property tree root
   ScrollTree scroll_tree = host()->property_trees()->scroll_tree;
-  ScrollTree expected_scroll_tree;
+  PropertyTrees property_trees;
+  ScrollTree expected_scroll_tree = property_trees.scroll_tree;
   ScrollNode* property_tree_root = expected_scroll_tree.Node(0);
   property_tree_root->id = kRootPropertyTreeNodeId;
   property_tree_root->parent_id = kInvalidPropertyTreeNodeId;
   property_tree_root->owner_id = kInvalidPropertyTreeNodeId;
   property_tree_root->data.scrollable = false;
   property_tree_root->data.main_thread_scrolling_reasons =
       MainThreadScrollingReason::kNotScrollingOnMain;
   property_tree_root->data.contains_non_fast_scrollable_region = false;
   property_tree_root->data.transform_id = kRootPropertyTreeNodeId;
 
@@ skipping 62 matching lines @@
   scroll_parent5.id = 8;
   scroll_parent5.owner_id = parent5->id();
   scroll_parent5.data.contains_non_fast_scrollable_region = true;
   scroll_parent5.data.bounds = gfx::Size(10, 10);
   scroll_parent5.data.should_flatten = true;
   scroll_parent5.data.user_scrollable_horizontal = true;
   scroll_parent5.data.user_scrollable_vertical = true;
   scroll_parent5.data.transform_id = parent5->transform_tree_index();
   expected_scroll_tree.Insert(scroll_parent5, 1);
 
+  expected_scroll_tree.synced_scroll_offset(parent2->id())
+      ->PushFromMainThread(gfx::ScrollOffset(0, 0));
+  expected_scroll_tree.synced_scroll_offset(child7->id())
+      ->PushFromMainThread(gfx::ScrollOffset(0, 0));
+  expected_scroll_tree.synced_scroll_offset(grand_child11->id())
+      ->PushFromMainThread(gfx::ScrollOffset(0, 0));
   expected_scroll_tree.set_needs_update(false);
 
   EXPECT_EQ(expected_scroll_tree, scroll_tree);
 
   // Check other layers' scroll_tree_index
   EXPECT_EQ(scroll_root1.id, page_scale_layer->scroll_tree_index());
   EXPECT_EQ(scroll_child6.id, grand_child10->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, parent3->scroll_tree_index());
   EXPECT_EQ(scroll_child7.id, child8->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, parent4->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, child9->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, grand_child12->scroll_tree_index());
 }
 
 }  // namespace
 }  // namespace cc