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

cc/resources/tile_manager_perftest.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 "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 58 matching lines @@
     return NULL;
   }
   virtual void ReleaseCanvasForRaster(RasterTask* task) OVERRIDE {}
 
  private:
   RasterTask::Vector completed_tasks_;
 };
 base::LazyInstance<FakeRasterizerImpl> g_fake_rasterizer =
     LAZY_INSTANCE_INITIALIZER;
 
-class TileManagerPerfTest : public testing::Test, public TileManagerClient {
+class TileManagerPerfTest : public testing::Test {
  public:
   TileManagerPerfTest()
       : memory_limit_policy_(ALLOW_ANYTHING),
         max_tiles_(10000),
-        ready_to_activate_(false),
         id_(7),
         proxy_(base::MessageLoopProxy::current()),
         host_impl_(ImplSidePaintingSettings(10000),
                    &proxy_,
                    &shared_bitmap_manager_),
         timer_(kWarmupRuns,
                base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
                kTimeCheckInterval) {}
 
   void SetTreePriority(TreePriority tree_priority) {
@@ skipping 189 matching lines @@
       tile_manager()->ManageTiles(global_state);
       tile_manager()->UpdateVisibleTiles();
       timer_.NextLap();
       host_impl_.ResetCurrentFrameTimeForNextFrame();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult(
         "manage_tiles", "", test_name, timer_.LapsPerSecond(), "runs/s", true);
   }
 
-  // TileManagerClient implementation.
-  virtual void NotifyReadyToActivate() OVERRIDE { ready_to_activate_ = true; }
-  virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE {}
-
   TileManager* tile_manager() { return host_impl_.tile_manager(); }
 
  protected:
   GlobalStateThatImpactsTilePriority global_state_;
 
   TestSharedBitmapManager shared_bitmap_manager_;
   TileMemoryLimitPolicy memory_limit_policy_;
   int max_tiles_;
-  bool ready_to_activate_;
   int id_;
   FakeImplProxy proxy_;
   FakeLayerTreeHostImpl host_impl_;
   FakePictureLayerImpl* pending_root_layer_;
   FakePictureLayerImpl* active_root_layer_;
   LapTimer timer_;
   scoped_refptr<FakePicturePileImpl> picture_pile_;
   LayerTreeSettings settings_;
 };
 
@@ skipping 19 matching lines @@
 
   RunRasterIteratorTest("2_16", 16);
   RunRasterIteratorTest("2_32", 32);
   RunRasterIteratorTest("2_64", 64);
   RunRasterIteratorTest("2_128", 128);
 }
 
 }  // namespace
 
 }  // namespace cc