Update from https://crrev.com/312398

cc/resources/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_RECORDING_SOURCE_H_
 #define CC_RESOURCES_RECORDING_SOURCE_H_
 
 #include "cc/base/cc_export.h"
 #include "cc/resources/picture.h"
-#include "third_party/skia/include/core/SkBBHFactory.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 class ContentLayerClient;
 class Region;
 class RasterSource;
 
 class CC_EXPORT RecordingSource {
@@ skipping 19 matching lines @@
   virtual void SetEmptyBounds() = 0;
   virtual void SetMinContentsScale(float min_contents_scale) = 0;
   virtual void SetSlowdownRasterScaleFactor(int factor) = 0;
   virtual bool IsSuitableForGpuRasterization() const = 0;
 
   // TODO(hendrikw): This is an implementation detail, remove it when possible.
   virtual void SetTileGridSize(const gfx::Size& tile_grid_size) = 0;
 
   // TODO(hendrikw): Figure out how to remove this.
   virtual void SetUnsuitableForGpuRasterizationForTesting() = 0;
-  virtual SkTileGridFactory::TileGridInfo GetTileGridInfoForTesting() const = 0;
+  virtual gfx::Size GetTileGridSizeForTesting() const = 0;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RECORDING_SOURCE_H_