Update from https://crrev.com/312398

cc/test/fake_picture_pile_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_pile_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 
 #include "base/synchronization/waitable_event.h"
 #include "cc/resources/picture_pile.h"
 #include "cc/test/fake_picture_pile.h"
 #include "cc/test/impl_side_painting_settings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 FakePicturePileImpl::FakePicturePileImpl() : playback_allowed_event_(nullptr) {
 }
 
 FakePicturePileImpl::FakePicturePileImpl(
     const PicturePile* other,
     base::WaitableEvent* playback_allowed_event)
     : PicturePileImpl(other),
       playback_allowed_event_(playback_allowed_event),
-      tile_grid_info_(other->GetTileGridInfoForTesting()) {
+      tile_grid_size_(other->GetTileGridSizeForTesting()) {
 }
 
 FakePicturePileImpl::~FakePicturePileImpl() {}
 
 scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateFilledPile(
     const gfx::Size& tile_size,
     const gfx::Size& layer_bounds) {
   FakePicturePile pile;
   pile.tiling().SetTilingSize(layer_bounds);
   pile.tiling().SetMaxTextureSize(tile_size);
@@ skipping 73 matching lines @@
   EXPECT_GE(y, 0);
   EXPECT_LT(x, tiling_.num_tiles_x());
   EXPECT_LT(y, tiling_.num_tiles_y());
 
   if (HasRecordingAt(x, y))
     return;
   gfx::Rect bounds(tiling().TileBounds(x, y));
   bounds.Inset(-buffer_pixels(), -buffer_pixels());
 
   scoped_refptr<Picture> picture(Picture::Create(
-      bounds, &client_, tile_grid_info_, true, Picture::RECORD_NORMALLY));
+      bounds, &client_, tile_grid_size_, true, Picture::RECORD_NORMALLY));
   picture_map_[std::pair<int, int>(x, y)].SetPicture(picture);
   EXPECT_TRUE(HasRecordingAt(x, y));
 
   has_any_recordings_ = true;
 }
 
 void FakePicturePileImpl::RemoveRecordingAt(int x, int y) {
   EXPECT_GE(x, 0);
   EXPECT_GE(y, 0);
   EXPECT_LT(x, tiling_.num_tiles_x());
@@ skipping 48 matching lines @@
   Clear();
   tiling_.SetBorderTexels(new_buffer_pixels);
 }
 
 void FakePicturePileImpl::Clear() {
   picture_map_.clear();
   recorded_viewport_ = gfx::Rect();
 }
 
 }  // namespace cc