content: Remove gpu memory buffer manager from ChildThreadImpl.

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7686bdf32144e79a0c091ceb4492a9464ebdc884..6636d3fc61cb6ed0df2fba6170cc79636393b5b2 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1638,7 +1638,12 @@ gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
   if (gpu_service_)
     return gpu_service_->gpu_memory_buffer_manager();
 #endif
-  return  gpu_memory_buffer_manager();
+  if (!gpu_memory_buffer_manager_) {
+    gpu_memory_buffer_manager_ =

[reveman, 2016/10/03 15:37:40]

Can you initialize this in RenderThreadImpl::Init instead of doing it lazily?

[sadrul, 2016/10/03 21:24:20]

Done.

+        base::MakeUnique<ChildGpuMemoryBufferManager>(thread_safe_sender());
+  }
+
+  return gpu_memory_buffer_manager_.get();
 }
 
 blink::scheduler::RendererScheduler* RenderThreadImpl::GetRendererScheduler() {
@@ -1857,7 +1862,7 @@ scoped_refptr<gpu::GpuChannelHost> RenderThreadImpl::EstablishGpuChannelSync() {
     gpu_channel_ =
         gpu::GpuChannelHost::Create(this, client_id, gpu_info, channel_handle,
                                     ChildProcess::current()->GetShutDownEvent(),
-                                    gpu_memory_buffer_manager());
+                                    GetGpuMemoryBufferManager());
   } else {
 #if defined(USE_AURA)
     gpu_channel_ = gpu_service_->EstablishGpuChannelSync();