Update from https://crrev.com/312398

cc/layers/picture_layer_unittest.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/layers/picture_layer.h"
 
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/test/fake_layer_tree_host.h"
@@ skipping 88 matching lines @@
   settings.default_tile_grid_size = gfx::Size(123, 123);
 
   MockContentLayerClient client;
   scoped_refptr<PictureLayer> layer = PictureLayer::Create(&client);
   FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
   scoped_ptr<FakeLayerTreeHost> host =
       FakeLayerTreeHost::Create(&host_client, settings);
   host->SetRootLayer(layer);
 
   // Tile-grid is set according to its setting.
-  SkTileGridFactory::TileGridInfo info =
-      layer->GetRecordingSourceForTesting()->GetTileGridInfoForTesting();
-  EXPECT_EQ(info.fTileInterval.width(), 123 - 2 * info.fMargin.width());
-  EXPECT_EQ(info.fTileInterval.height(), 123 - 2 * info.fMargin.height());
+  gfx::Size size =
+      layer->GetRecordingSourceForTesting()->GetTileGridSizeForTesting();
+  EXPECT_EQ(size.width(), 123);
+  EXPECT_EQ(size.height(), 123);
 }
 
 }  // namespace
 }  // namespace cc