Update from https://crrev.com/314320

cc/test/fake_picture_layer_impl.cc

 // Copyright 2013 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/test/fake_picture_layer_impl.h"
 
 #include <vector>
 #include "cc/resources/tile.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 
 FakePictureLayerImpl::FakePictureLayerImpl(
     LayerTreeImpl* tree_impl,
     int id,
     scoped_refptr<RasterSource> raster_source,
     bool is_mask)
-    : PictureLayerImpl(tree_impl, id, is_mask),
+    : PictureLayerImpl(tree_impl,
+                       id,
+                       is_mask,
+                       new LayerImpl::SyncedScrollOffset),
       append_quads_count_(0),
       did_become_active_call_count_(0),
       has_valid_tile_priorities_(false),
       use_set_valid_tile_priorities_flag_(false),
       release_resources_count_(0) {
   SetBounds(raster_source->GetSize());
   SetContentBounds(raster_source->GetSize());
   SetRasterSourceOnPending(raster_source, Region());
 }
 
 FakePictureLayerImpl::FakePictureLayerImpl(
     LayerTreeImpl* tree_impl,
     int id,
     scoped_refptr<RasterSource> raster_source,
     bool is_mask,
     const gfx::Size& layer_bounds)
-    : PictureLayerImpl(tree_impl, id, is_mask),
+    : PictureLayerImpl(tree_impl,
+                       id,
+                       is_mask,
+                       new LayerImpl::SyncedScrollOffset),
       append_quads_count_(0),
       did_become_active_call_count_(0),
       has_valid_tile_priorities_(false),
       use_set_valid_tile_priorities_flag_(false),
       release_resources_count_(0) {
   SetBounds(layer_bounds);
   SetContentBounds(layer_bounds);
   SetRasterSourceOnPending(raster_source, Region());
 }
 
 FakePictureLayerImpl::FakePictureLayerImpl(LayerTreeImpl* tree_impl,
                                            int id,
                                            bool is_mask)
-    : PictureLayerImpl(tree_impl, id, is_mask),
+    : FakePictureLayerImpl(tree_impl,
+                           id,
+                           is_mask,
+                           new LayerImpl::SyncedScrollOffset) {
+}
+
+FakePictureLayerImpl::FakePictureLayerImpl(
+    LayerTreeImpl* tree_impl,
+    int id,
+    bool is_mask,
+    scoped_refptr<LayerImpl::SyncedScrollOffset> synced_scroll_offset)
+    : PictureLayerImpl(tree_impl, id, is_mask, synced_scroll_offset),
       append_quads_count_(0),
       did_become_active_call_count_(0),
       has_valid_tile_priorities_(false),
       use_set_valid_tile_priorities_flag_(false),
       release_resources_count_(0) {
 }
 
 scoped_ptr<LayerImpl> FakePictureLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
-  return make_scoped_ptr(new FakePictureLayerImpl(tree_impl, id(), is_mask_));
+  return make_scoped_ptr(new FakePictureLayerImpl(tree_impl, id(), is_mask_,
+                                                  synced_scroll_offset()));
 }
 
 void FakePictureLayerImpl::PushPropertiesTo(LayerImpl* layer_impl) {
   FakePictureLayerImpl* picture_layer_impl =
       static_cast<FakePictureLayerImpl*>(layer_impl);
   picture_layer_impl->fixed_tile_size_ = fixed_tile_size_;
   PictureLayerImpl::PushPropertiesTo(layer_impl);
 }
 
 void FakePictureLayerImpl::AppendQuads(
@@ skipping 178 matching lines @@
   return CountTilesRequired(
       &PictureLayerTiling::IsTileRequiredForDrawIfVisible);
 }
 
 void FakePictureLayerImpl::ReleaseResources() {
   PictureLayerImpl::ReleaseResources();
   ++release_resources_count_;
 }
 
 }  // namespace cc