gpu: Compositor management of GpuMemoryBuffer instances.

cc/test/layer_tree_test.cc

Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 9b9bae634abc92183976d9dd33f21bec6bbd0b94..57bd0c56bde1a48b8aaf01e3946fa995c7e464de 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -18,6 +18,7 @@
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/test_context_provider.h"
+#include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/trees/layer_tree_host_client.h"
@@ -112,14 +113,16 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
       const LayerTreeSettings& settings,
       LayerTreeHostImplClient* host_impl_client,
       Proxy* proxy,
-      SharedBitmapManager* manager,
+      SharedBitmapManager* shared_bitmap_manager,
+      GpuMemoryBufferManager* gpu_memory_buffer_manager,
       RenderingStatsInstrumentation* stats_instrumentation) {
     return make_scoped_ptr(
         new LayerTreeHostImplForTesting(test_hooks,
                                         settings,
                                         host_impl_client,
                                         proxy,
-                                        manager,
+                                        shared_bitmap_manager,
+                                        gpu_memory_buffer_manager,
                                         stats_instrumentation));
   }
 
@@ -129,13 +132,15 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
       const LayerTreeSettings& settings,
       LayerTreeHostImplClient* host_impl_client,
       Proxy* proxy,
-      SharedBitmapManager* manager,
+      SharedBitmapManager* shared_bitmap_manager,
+      GpuMemoryBufferManager* gpu_memory_buffer_manager,
       RenderingStatsInstrumentation* stats_instrumentation)
       : LayerTreeHostImpl(settings,
                           host_impl_client,
                           proxy,
                           stats_instrumentation,
-                          manager,
+                          shared_bitmap_manager,
+                          gpu_memory_buffer_manager,
                           0),
         test_hooks_(test_hooks),
         block_notify_ready_to_activate_for_testing_(false),
@@ -363,6 +368,7 @@ class LayerTreeHostForTesting : public LayerTreeHost {
         host_impl_client,
         proxy(),
         shared_bitmap_manager_.get(),
+        gpu_memory_buffer_manager_.get(),
         rendering_stats_instrumentation());
   }
 
@@ -380,12 +386,14 @@ class LayerTreeHostForTesting : public LayerTreeHost {
   LayerTreeHostForTesting(TestHooks* test_hooks,
                           LayerTreeHostClient* client,
                           const LayerTreeSettings& settings)
-      : LayerTreeHost(client, NULL, settings),
-        shared_bitmap_manager_(new TestSharedBitmapManager()),
+      : LayerTreeHost(client, NULL, NULL, settings),
+        shared_bitmap_manager_(new TestSharedBitmapManager),
+        gpu_memory_buffer_manager_(new TestGpuMemoryBufferManager),
         test_hooks_(test_hooks),
         test_started_(false) {}
 
-  scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
+  scoped_ptr<TestSharedBitmapManager> shared_bitmap_manager_;
+  scoped_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_;
   TestHooks* test_hooks_;
   bool test_started_;
 };