Implement MusGpuMemoryBufferManager

components/mus/gpu/gpu_service_mus.cc

Index: components/mus/gpu/gpu_service_mus.cc
diff --git a/components/mus/gpu/gpu_service_mus.cc b/components/mus/gpu/gpu_service_mus.cc
index 561dbeac921067ca01c97d01907485e9b015e73e..83199275eb12faf6a5c52943c7f5b2f195dd42cd 100644
--- a/components/mus/gpu/gpu_service_mus.cc
+++ b/components/mus/gpu/gpu_service_mus.cc
@@ -8,7 +8,8 @@
 #include "base/memory/singleton.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/mus/common/mojo_gpu_memory_buffer_manager.h"
+#include "build/build_config.h"
+#include "components/mus/gpu/mus_gpu_memory_buffer_manager.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/config/gpu_info_collector.h"
@@ -29,6 +30,10 @@
 #include "ui/gl/init/gl_factory.h"
 #include "url/gurl.h"
 
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
 namespace mus {
 namespace {
 
@@ -185,7 +190,8 @@ void GpuServiceMus::Initialize() {
                             base::Unretained(this), &channel_handle, &event));
   event.Wait();
 
-  gpu_memory_buffer_manager_local_.reset(new MojoGpuMemoryBufferManager);
+  gpu_memory_buffer_manager_local_.reset(
+      new MusGpuMemoryBufferManager(kLocalGpuChannelClientId));
   gpu_channel_local_ = gpu::GpuChannelHost::Create(
       this, kLocalGpuChannelClientId, gpu_info_, channel_handle,
       &shutdown_event_, gpu_memory_buffer_manager_local_.get());
@@ -205,6 +211,10 @@ void GpuServiceMus::InitializeOnGpuThread(IPC::ChannelHandle* channel_handle,
         gpu::GpuMemoryBufferFactory::CreateNativeType();
   }
 
+#if defined(USE_OZONE)

[rjkroege, 2016/06/08 21:16:43]

It should probably be at the top. The CreateNativeType() may someday depend on
ozone already being initialized.

[Peng, 2016/06/08 21:40:36]

Done.

+  ui::OzonePlatform::InitializeForGPU();
+#endif
+
   if (!gl::init::InitializeGLOneOff())
     VLOG(1) << "gl::init::InitializeGLOneOff failed";