Index: ui/compositor/test/in_process_context_factory.cc |
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc |
index d87d75b741f57c889901fb69ba46d27049cc7048..3bf0d3ebf764648e733b667c61598d52b9afdd2b 100644 |
--- a/ui/compositor/test/in_process_context_factory.cc |
+++ b/ui/compositor/test/in_process_context_factory.cc |
@@ -20,8 +20,7 @@ |
namespace ui { |
InProcessContextFactory::InProcessContextFactory() |
- : shared_bitmap_manager_(new cc::TestSharedBitmapManager()), |
- next_surface_id_namespace_(1u) { |
+ : next_surface_id_namespace_(1u) { |
DCHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone) |
<< "If running tests, ensure that main() is calling " |
<< "gfx::GLSurface::InitializeOneOffForTests()"; |
@@ -95,7 +94,12 @@ void InProcessContextFactory::RemoveCompositor(Compositor* compositor) {} |
bool InProcessContextFactory::DoesCreateTestContexts() { return false; } |
cc::SharedBitmapManager* InProcessContextFactory::GetSharedBitmapManager() { |
- return shared_bitmap_manager_.get(); |
+ return &shared_bitmap_manager_; |
+} |
+ |
+cc::GpuMemoryBufferManager* |
+InProcessContextFactory::GetGpuMemoryBufferManager() { |
+ return &gpu_memory_buffer_manager_; |
} |
base::MessageLoopProxy* InProcessContextFactory::GetCompositorMessageLoop() { |