cc: Refactor how picture layers are exposed to the tile manager.

cc/resources/tile_manager_unittest.cc

Index: cc/resources/tile_manager_unittest.cc
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc
index ce54d3822bd4ee67e4917fd714feed690f2eb4ec..2b529ff678e6c8a0a8f939cf7e5904d56b8491fb 100644
--- a/cc/resources/tile_manager_unittest.cc
+++ b/cc/resources/tile_manager_unittest.cc
@@ -83,6 +83,9 @@ class TileManagerTest : public testing::TestWithParam<bool>,
   }
 
   // TileManagerClient implementation.
+  virtual const std::vector<PictureLayerImpl*>& GetPictureLayers() OVERRIDE {
+    return picture_layers_;
+  }
   virtual void NotifyReadyToActivate() OVERRIDE { ready_to_activate_ = true; }
   virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE {}
 
@@ -158,6 +161,7 @@ class TileManagerTest : public testing::TestWithParam<bool>,
   TileMemoryLimitPolicy memory_limit_policy_;
   int max_tiles_;
   bool ready_to_activate_;
+  std::vector<PictureLayerImpl*> picture_layers_;
 };
 
 TEST_P(TileManagerTest, EnoughMemoryAllowAnything) {
@@ -718,6 +722,9 @@ class TileManagerTileIteratorTest : public testing::Test,
   }
 
   // TileManagerClient implementation.
+  virtual const std::vector<PictureLayerImpl*>& GetPictureLayers() OVERRIDE {
+    return picture_layers_;
+  }
   virtual void NotifyReadyToActivate() OVERRIDE { ready_to_activate_ = true; }
   virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE {}
 
@@ -735,6 +742,7 @@ class TileManagerTileIteratorTest : public testing::Test,
   FakeLayerTreeHostImpl host_impl_;
   FakePictureLayerImpl* pending_layer_;
   FakePictureLayerImpl* active_layer_;
+  std::vector<PictureLayerImpl*> picture_layers_;
 };
 
 TEST_F(TileManagerTileIteratorTest, PairedPictureLayers) {
@@ -757,8 +765,8 @@ TEST_F(TileManagerTileIteratorTest, PairedPictureLayers) {
   TileManager* tile_manager = TileManagerTileIteratorTest::tile_manager();
   EXPECT_TRUE(tile_manager);
 
-  tile_manager->RegisterPictureLayerImpl(active_layer.get());
-  tile_manager->RegisterPictureLayerImpl(pending_layer.get());
+  picture_layers_.push_back(active_layer.get());
+  picture_layers_.push_back(pending_layer.get());
 
   std::vector<TileManager::PairedPictureLayer> paired_layers;
   tile_manager->GetPairedPictureLayers(&paired_layers);
@@ -789,8 +797,7 @@ TEST_F(TileManagerTileIteratorTest, PairedPictureLayers) {
   EXPECT_EQ(active_layer.get(), paired_layers[0].active_layer);
   EXPECT_EQ(pending_layer.get(), paired_layers[0].pending_layer);
 
-  tile_manager->UnregisterPictureLayerImpl(active_layer.get());
-  tile_manager->UnregisterPictureLayerImpl(pending_layer.get());
+  picture_layers_.clear();

[vmpstr, 2014/06/05 22:38:02]

Do you need this?

[reveman, 2014/06/06 17:27:24]

Nope. Done.

 }
 
 TEST_F(TileManagerTileIteratorTest, RasterTileIterator) {