Revert "cc: Added tile bundles"

cc/resources/tile_manager.h

Index: cc/resources/tile_manager.h
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index 98a66f854ca44adfd654e846cc6194f88c2e614b..78beb1b15fb0fc7e5424851c9a9ee068518ef15f 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -21,7 +21,6 @@
 #include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/tile.h"
-#include "cc/resources/tile_bundle.h"
 
 namespace cc {
 class ResourceProvider;
@@ -48,8 +47,7 @@ scoped_ptr<base::Value> RasterTaskCompletionStatsAsValue(
 // by layers; they automatically register with the manager when they are
 // created, and unregister from the manager when they are deleted.
 class CC_EXPORT TileManager : public RasterWorkerPoolClient,
-                              public RefCountedManager<Tile>,
-                              public RefCountedManager<TileBundle> {
+                              public RefCountedManager<Tile> {
  public:
   static scoped_ptr<TileManager> Create(
       TileManagerClient* client,
@@ -76,11 +74,6 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
                                  int source_frame_number,
                                  int flags);
 
-  scoped_refptr<TileBundle> CreateTileBundle(int offset_x,
-                                             int offset_y,
-                                             int width,
-                                             int height);
-
   scoped_ptr<base::Value> BasicStateAsValue() const;
   scoped_ptr<base::Value> AllTilesAsValue() const;
   void GetMemoryStats(size_t* memory_required_bytes,
@@ -131,22 +124,16 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
               size_t max_raster_usage_bytes,
               RenderingStatsInstrumentation* rendering_stats_instrumentation);
 
-  // Methods called by Tile and TileBundle
-  friend class TileBundle;
+  // Methods called by Tile
   friend class Tile;
-
   void DidChangeTilePriority(Tile* tile);
-  void DidChangeTileBundlePriority(TileBundle* bundle);
 
   void CleanUpReleasedTiles();
 
-  // Overridden from RefCountedManager<Tile>:
+  // Overriden from RefCountedManager<Tile>:
   virtual void Release(Tile* tile) OVERRIDE;
 
-  // Overridden from RefCountedManager<TileBundle>:
-  virtual void Release(TileBundle* bundle) OVERRIDE;
-
-  // Overridden from RasterWorkerPoolClient:
+  // Overriden from RasterWorkerPoolClient:
   virtual bool ShouldForceTasksRequiredForActivationToComplete() const
       OVERRIDE;
   virtual void DidFinishRunningTasks() OVERRIDE;
@@ -198,9 +185,6 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
   typedef base::hash_map<Tile::Id, Tile*> TileMap;
   TileMap tiles_;
 
-  typedef base::hash_map<TileBundle::Id, TileBundle*> TileBundleMap;
-  TileBundleMap bundles_;
-
   PrioritizedTileSet prioritized_tiles_;
   bool prioritized_tiles_dirty_;
 
@@ -232,7 +216,6 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
   RasterTaskCompletionStats update_visible_tiles_stats_;
 
   std::vector<Tile*> released_tiles_;
-  std::vector<TileBundle*> released_tile_bundles_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };