cc: Added tile bundles

cc/resources/picture_layer_tiling_set_unittest.cc

Index: cc/resources/picture_layer_tiling_set_unittest.cc
diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc
index 96129c64fe5452aa0fc260c12cd4b7e1df728868..b61bb97b0b6a91d306c480ae05c80a8525414259 100644
--- a/cc/resources/picture_layer_tiling_set_unittest.cc
+++ b/cc/resources/picture_layer_tiling_set_unittest.cc
@@ -12,6 +12,7 @@
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_picture_layer_tiling_client.h"
+#include "cc/test/fake_tile_manager.h"
 #include "cc/test/fake_tile_manager_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/size_conversions.h"
@@ -152,18 +153,37 @@ class PictureLayerTilingSetSyncTest : public testing::Test {
         target_bounds_(gfx::Size(30, 30)) {
     source_client_.SetTileSize(tile_size_);
     target_client_.SetTileSize(tile_size_);
+
+    output_surface_ = FakeOutputSurface::Create3d();
+    CHECK(output_surface_->BindToClient(&output_surface_client_));
+    resource_provider_ =
+        ResourceProvider::Create(output_surface_.get(), NULL, 0, false, 1);
+    tile_manager_ = make_scoped_ptr(
+        new FakeTileManager(&tile_manager_client_, resource_provider_.get()));
+    source_client_.set_tile_manager(tile_manager_.get());
+    target_client_.set_tile_manager(tile_manager_.get());
+
     source_.reset(new PictureLayerTilingSet(&source_client_, source_bounds_));
     target_.reset(new PictureLayerTilingSet(&target_client_, target_bounds_));
   }
 
+  ~PictureLayerTilingSetSyncTest() {
+    source_.reset(NULL);
+    target_.reset(NULL);
+    tile_manager_.reset(NULL);
+    resource_provider_.reset(NULL);
+  }
+
   // Sync from source to target.
   void SyncTilings(gfx::Size new_bounds,
                    const Region& invalidation,
                    float minimum_scale) {
+    target_client_.MarkPending();
+    source_client_.MarkActive();
     for (size_t i = 0; i < source_->num_tilings(); ++i)
-      source_->tiling_at(i)->CreateAllTilesForTesting();
+      source_->tiling_at(i)->CreateTilesForTesting(ACTIVE_TREE);
     for (size_t i = 0; i < target_->num_tilings(); ++i)
-      target_->tiling_at(i)->CreateAllTilesForTesting();
+      target_->tiling_at(i)->CreateTilesForTesting(PENDING_TREE);
 
     target_->SyncTilings(
         *source_.get(), new_bounds, invalidation, minimum_scale);
@@ -222,7 +242,7 @@ class PictureLayerTilingSetSyncTest : public testing::Test {
     else if (!tiling->live_tiles_rect().IsEmpty())
       EXPECT_TRUE(tiling->ContentRect().Contains(tiling->live_tiles_rect()));
 
-    std::vector<Tile*> tiles = tiling->AllTilesForTesting();
+    std::vector<Tile*> tiles = tiling->TilesForTesting(PENDING_TREE);
     for (size_t i = 0; i < tiles.size(); ++i) {
       const Tile* tile = tiles[i];
       ASSERT_TRUE(!!tile);
@@ -248,6 +268,12 @@ class PictureLayerTilingSetSyncTest : public testing::Test {
   FakePictureLayerTilingClient target_client_;
   gfx::Size target_bounds_;
   scoped_ptr<PictureLayerTilingSet> target_;
+
+  FakeTileManagerClient tile_manager_client_;
+  scoped_ptr<FakeTileManager> tile_manager_;
+  scoped_ptr<ResourceProvider> resource_provider_;
+  scoped_ptr<FakeOutputSurface> output_surface_;
+  FakeOutputSurfaceClient output_surface_client_;
 };
 
 TEST_F(PictureLayerTilingSetSyncTest, EmptyBounds) {
@@ -348,7 +374,7 @@ TEST_F(PictureLayerTilingSetSyncTest, MinimumScale) {
 TEST_F(PictureLayerTilingSetSyncTest, Invalidation) {
   source_->AddTiling(2.f);
   target_->AddTiling(2.f);
-  target_->tiling_at(0)->CreateAllTilesForTesting();
+  target_->tiling_at(0)->CreateTilesForTesting(PENDING_TREE);
 
   Region layer_invalidation;
   layer_invalidation.Union(gfx::Rect(0, 0, 1, 1));