cc: Added tile bundles

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 f25329267c260a1d689e1862d8cf2829db20e92d..c89626be809d7a0b5b415846d4c08a3be928b888 100644
--- a/cc/resources/tile_manager_unittest.cc
+++ b/cc/resources/tile_manager_unittest.cc
@@ -67,6 +67,7 @@ class TileManagerTest : public testing::TestWithParam<bool> {
   }
 
   virtual void TearDown() OVERRIDE {
+    bundles_.clear();
     tile_manager_.reset(NULL);
     picture_pile_ = NULL;
 
@@ -87,9 +88,14 @@ class TileManagerTest : public testing::TestWithParam<bool> {
                                                            0,
                                                            0,
                                                            true);
-      tile->SetPriority(ACTIVE_TREE, active_priority);
-      tile->SetPriority(PENDING_TREE, pending_priority);
+      scoped_refptr<TileBundle> bundle =
+          tile_manager_->CreateTileBundle(0, 0, 1, 1);
+      bundle->SetPriority(ACTIVE_TREE, active_priority);
+      bundle->SetPriority(PENDING_TREE, pending_priority);
+      bundle->AddTileAt(ACTIVE_TREE, 0, 0, tile);
+      bundle->AddTileAt(PENDING_TREE, 0, 0, tile);
       tiles.push_back(tile);
+      bundles_.push_back(bundle);
     }
     return tiles;
   }
@@ -142,6 +148,7 @@ class TileManagerTest : public testing::TestWithParam<bool> {
   scoped_ptr<ResourceProvider> resource_provider_;
   TileMemoryLimitPolicy memory_limit_policy_;
   int max_memory_tiles_;
+  std::vector<scoped_refptr<TileBundle> > bundles_;
 };
 
 TEST_P(TileManagerTest, EnoughMemoryAllowAnything) {
@@ -528,3 +535,4 @@ INSTANTIATE_TEST_CASE_P(TileManagerTests,
 
 }  // namespace
 }  // namespace cc
+