Update from https://crrev.com/312398

cc/debug/picture_record_benchmark.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/debug/picture_record_benchmark.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/resources/picture.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
-#include "third_party/skia/include/core/SkBBHFactory.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
 namespace {
 
 const int kPositionIncrement = 100;
 const int kTileGridSize = 512;
-const int kTileGridBorder = 1;
 
 }  // namespace
 
 PictureRecordBenchmark::PictureRecordBenchmark(
     scoped_ptr<base::Value> value,
     const MicroBenchmark::DoneCallback& callback)
     : MicroBenchmark(callback) {
   if (!value)
     return;
 
@@ skipping 50 matching lines @@
 }
 
 void PictureRecordBenchmark::Run(Layer* layer) {
   layer->RunMicroBenchmark(this);
 }
 
 void PictureRecordBenchmark::RunOnLayer(PictureLayer* layer) {
   ContentLayerClient* painter = layer->client();
   gfx::Size content_bounds = layer->content_bounds();
 
-  SkTileGridFactory::TileGridInfo tile_grid_info;
-  tile_grid_info.fTileInterval.set(kTileGridSize - 2 * kTileGridBorder,
-                                   kTileGridSize - 2 * kTileGridBorder);
-  tile_grid_info.fMargin.set(kTileGridBorder, kTileGridBorder);
-  tile_grid_info.fOffset.set(-kTileGridBorder, -kTileGridBorder);
+  gfx::Size tile_grid_size(kTileGridSize, kTileGridSize);
 
   for (size_t i = 0; i < dimensions_.size(); ++i) {
     std::pair<int, int> dimensions = dimensions_[i];
     int width = dimensions.first;
     int height = dimensions.second;
 
     int y_limit = std::max(1, content_bounds.height() - height);
     int x_limit = std::max(1, content_bounds.width() - width);
     for (int y = 0; y < y_limit; y += kPositionIncrement) {
       for (int x = 0; x < x_limit; x += kPositionIncrement) {
         gfx::Rect rect = gfx::Rect(x, y, width, height);
 
         base::TimeTicks start = base::TimeTicks::HighResNow();
 
         scoped_refptr<Picture> picture = Picture::Create(
-            rect, painter, tile_grid_info, false, Picture::RECORD_NORMALLY);
+            rect, painter, tile_grid_size, false, Picture::RECORD_NORMALLY);
 
         base::TimeTicks end = base::TimeTicks::HighResNow();
         base::TimeDelta duration = end - start;
         TotalTime& total_time = times_[dimensions];
         total_time.first += duration;
         total_time.second++;
       }
     }
   }
 }
 
 }  // namespace cc