Merge 241994 "Revert "cc: Added tile bundles""

cc/layers/picture_image_layer_impl_unittest.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 "cc/layers/picture_image_layer_impl.h"
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.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 "cc/test/impl_side_painting_settings.h"
 #include "cc/test/mock_quad_culler.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class TestablePictureImageLayerImpl : public PictureImageLayerImpl {
  public:
   TestablePictureImageLayerImpl(LayerTreeImpl* tree_impl, int id)
       : PictureImageLayerImpl(tree_impl, id) {
   }
 
   PictureLayerTilingSet* tilings() { return tilings_.get(); }
 
   friend class PictureImageLayerImplTest;
 };
 
 class PictureImageLayerImplTest : public testing::Test {
  public:
   PictureImageLayerImplTest()
-      : host_impl_(ImplSidePaintingSettings(), &proxy_),
-        tile_manager_(&tile_manager_client_),
-        tiling_client_(&tile_manager_) {
+      : host_impl_(ImplSidePaintingSettings(), &proxy_) {
     tiling_client_.SetTileSize(ImplSidePaintingSettings().default_tile_size);
     host_impl_.CreatePendingTree();
     host_impl_.InitializeRenderer(CreateFakeOutputSurface());
   }
 
   scoped_ptr<TestablePictureImageLayerImpl> CreateLayer(int id,
                                                         WhichTree which_tree) {
     LayerTreeImpl* tree = NULL;
     switch (which_tree) {
       case ACTIVE_TREE:
@@ skipping 15 matching lines @@
     return make_scoped_ptr(layer);
   }
 
   void UpdateDrawProperties() {
     host_impl_.pending_tree()->UpdateDrawProperties();
   }
 
  protected:
   FakeImplProxy proxy_;
   FakeLayerTreeHostImpl host_impl_;
-  FakeTileManagerClient tile_manager_client_;
-  FakeTileManager tile_manager_;
   FakePictureLayerTilingClient tiling_client_;
 };
 
 TEST_F(PictureImageLayerImplTest, CalculateContentsScale) {
   scoped_ptr<TestablePictureImageLayerImpl> layer(CreateLayer(1, PENDING_TREE));
   layer->SetDrawsContent(true);
 
   float contents_scale_x;
   float contents_scale_y;
   gfx::Size content_bounds;
@@ skipping 74 matching lines @@
   active_layer->DidDraw(NULL);
 
   EXPECT_EQ(DrawQuad::TILED_CONTENT, quad_culler.quad_list()[0]->material);
 
   // Tiles are ready at correct scale, so should not set had_incomplete_tile.
   EXPECT_FALSE(data.had_incomplete_tile);
 }
 
 }  // namespace
 }  // namespace cc