Update from https://crrev.com/312398

cc/resources/display_list_recording_source.h

 // Copyright 2014 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.
 
 #ifndef CC_RESOURCES_DISPLAY_LIST_RECORDING_SOURCE_H_
 #define CC_RESOURCES_DISPLAY_LIST_RECORDING_SOURCE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/resources/recording_source.h"
 
@@ skipping 16 matching lines @@
       int frame_number,
       Picture::RecordingMode recording_mode) override;
   scoped_refptr<RasterSource> CreateRasterSource() const override;
   gfx::Size GetSize() const final;
   void SetEmptyBounds() override;
   void SetMinContentsScale(float min_contents_scale) override;
   void SetSlowdownRasterScaleFactor(int factor) override;
   bool IsSuitableForGpuRasterization() const override;
   void SetTileGridSize(const gfx::Size& tile_grid_size) override;
   void SetUnsuitableForGpuRasterizationForTesting() override;
-  SkTileGridFactory::TileGridInfo GetTileGridInfoForTesting() const override;
+  gfx::Size GetTileGridSizeForTesting() const override;
 
  protected:
   void Clear();
 
   gfx::Rect recorded_viewport_;
   gfx::Size size_;
   int slow_down_raster_scale_factor_for_debug_;
   bool can_use_lcd_text_;
   bool is_solid_color_;
   SkColor solid_color_;
   int pixel_record_distance_;
 
   scoped_refptr<DisplayItemList> display_list_;
 
  private:
   friend class DisplayListRasterSource;
 
   void DetermineIfSolidColor();
 
   bool is_suitable_for_gpu_rasterization_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayListRecordingSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_DISPLAY_LIST_RECORDING_SOURCE_H_