Index: cc/tiles/tile_manager_unittest.cc |
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc |
index 429298520022236f51f8f89594299102849e5760..bf47cd3d5b6e0466792ae8a55ae38c8d45c4b4dd 100644 |
--- a/cc/tiles/tile_manager_unittest.cc |
+++ b/cc/tiles/tile_manager_unittest.cc |
@@ -25,9 +25,7 @@ |
#include "cc/test/fake_tile_manager.h" |
#include "cc/test/fake_tile_task_manager.h" |
#include "cc/test/layer_tree_settings_for_testing.h" |
-#include "cc/test/test_gpu_memory_buffer_manager.h" |
#include "cc/test/test_layer_tree_host_base.h" |
-#include "cc/test/test_shared_bitmap_manager.h" |
#include "cc/test/test_task_graph_runner.h" |
#include "cc/test/test_tile_priorities.h" |
#include "cc/tiles/eviction_tile_priority_queue.h" |
@@ -1475,17 +1473,12 @@ class TileManagerTest : public TestLayerTreeHostBase { |
// MockLayerTreeHostImpl allows us to intercept tile manager callbacks. |
class MockLayerTreeHostImpl : public FakeLayerTreeHostImpl { |
public: |
- MockLayerTreeHostImpl( |
- const LayerTreeSettings& settings, |
- TaskRunnerProvider* task_runner_provider, |
- SharedBitmapManager* manager, |
- TaskGraphRunner* task_graph_runner, |
- gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) |
+ MockLayerTreeHostImpl(const LayerTreeSettings& settings, |
+ TaskRunnerProvider* task_runner_provider, |
+ TaskGraphRunner* task_graph_runner) |
: FakeLayerTreeHostImpl(settings, |
task_runner_provider, |
- manager, |
- task_graph_runner, |
- gpu_memory_buffer_manager) {} |
+ task_graph_runner) {} |
MOCK_METHOD0(NotifyAllTileTasksCompleted, void()); |
MOCK_METHOD0(NotifyReadyToDraw, void()); |
@@ -1494,12 +1487,9 @@ class TileManagerTest : public TestLayerTreeHostBase { |
std::unique_ptr<FakeLayerTreeHostImpl> CreateHostImpl( |
const LayerTreeSettings& settings, |
TaskRunnerProvider* task_runner_provider, |
- SharedBitmapManager* shared_bitmap_manager, |
- TaskGraphRunner* task_graph_runner, |
- gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) override { |
+ TaskGraphRunner* task_graph_runner) override { |
return base::MakeUnique<MockLayerTreeHostImpl>( |
- settings, task_runner_provider, shared_bitmap_manager, |
- task_graph_runner, gpu_memory_buffer_manager); |
+ settings, task_runner_provider, task_graph_runner); |
} |
// By default use software compositing (no context provider). |