Update from https://crrev.com/304715

cc/resources/picture_layer_tiling_set_unittest.cc

Index: cc/resources/picture_layer_tiling_set_unittest.cc
diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc
index 2a215a8657c2bbf2e4731f9e61610feb28559420..7acc55b9192e1bec8916f61199ab25ed07d1eab9 100644
--- a/cc/resources/picture_layer_tiling_set_unittest.cc
+++ b/cc/resources/picture_layer_tiling_set_unittest.cc
@@ -430,14 +430,14 @@ TEST_F(PictureLayerTilingSetSyncTest, KeepExisting) {
   for (size_t i = 0; i < arraysize(target_scales); ++i)
     target_->AddTiling(target_scales[i], target_bounds_);
 
-  PictureLayerTiling* tiling1 = source_->TilingAtScale(1.f);
+  PictureLayerTiling* tiling1 = source_->FindTilingWithScale(1.f);
   ASSERT_TRUE(tiling1);
   tiling1->CreateAllTilesForTesting();
   EXPECT_EQ(tiling1->contents_scale(), 1.f);
   Tile* tile1 = FindTileAtOrigin(tiling1);
   ASSERT_TRUE(tile1);
 
-  PictureLayerTiling* tiling2 = source_->TilingAtScale(2.f);
+  PictureLayerTiling* tiling2 = source_->FindTilingWithScale(2.f);
   tiling2->CreateAllTilesForTesting();
   ASSERT_TRUE(tiling2);
   EXPECT_EQ(tiling2->contents_scale(), 2.f);
@@ -448,11 +448,11 @@ TEST_F(PictureLayerTilingSetSyncTest, KeepExisting) {
   SyncTilings(new_bounds);
   VerifyTargetEqualsSource(new_bounds);
 
-  EXPECT_EQ(tiling1, source_->TilingAtScale(1.f));
+  EXPECT_EQ(tiling1, source_->FindTilingWithScale(1.f));
   EXPECT_EQ(tile1, FindTileAtOrigin(tiling1));
   EXPECT_FALSE(tiling1->live_tiles_rect().IsEmpty());
 
-  EXPECT_EQ(tiling2, source_->TilingAtScale(2.f));
+  EXPECT_EQ(tiling2, source_->FindTilingWithScale(2.f));
   EXPECT_EQ(tile2, FindTileAtOrigin(tiling2));
   EXPECT_FALSE(tiling2->live_tiles_rect().IsEmpty());
 }