Update from https://crrev.com/304715

cc/resources/picture_layer_tiling_set_unittest.cc

 // Copyright 2012 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/resources/picture_layer_tiling_set.h"
 
 #include <map>
 #include <vector>
 
 #include "cc/resources/resource_provider.h"
@@ skipping 412 matching lines @@
 }
 
 TEST_F(PictureLayerTilingSetSyncTest, KeepExisting) {
   float source_scales[] = {0.7f, 1.f, 1.1f, 2.f};
   for (size_t i = 0; i < arraysize(source_scales); ++i)
     source_->AddTiling(source_scales[i], source_bounds_);
   float target_scales[] = {0.5f, 1.f, 2.f};
   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);
   Tile* tile2 = FindTileAtOrigin(tiling2);
   ASSERT_TRUE(tile2);
 
   gfx::Size new_bounds(15, 40);
   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());
 }
 
 TEST_F(PictureLayerTilingSetSyncTest, EmptySet) {
   float target_scales[] = {0.2f, 1.f};
   for (size_t i = 0; i < arraysize(target_scales); ++i)
     target_->AddTiling(target_scales[i], target_bounds_);
 
   gfx::Size new_bounds(15, 40);
@@ skipping 80 matching lines @@
   std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting();
   for (size_t i = 0; i < original_tiles.size(); ++i) {
     std::vector<Tile*>::iterator find =
         std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]);
     EXPECT_TRUE(find == new_tiles.end());
   }
 }
 
 }  // namespace
 }  // namespace cc