gpu: Use mojom.GpuService API for memory allocation.

content/browser/gpu/gpu_process_host.cc

Index: content/browser/gpu/gpu_process_host.cc
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 4aabfd167311f7e7bd0ab2e5047601a811a3685a..6f59aa0b98285f76056c9dbfe8cbba03f31ad519 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -660,8 +660,6 @@ bool GpuProcessHost::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
   IPC_BEGIN_MESSAGE_MAP(GpuProcessHost, message)
     IPC_MESSAGE_HANDLER(GpuHostMsg_Initialized, OnInitialized)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_GpuMemoryBufferCreated,
-                        OnGpuMemoryBufferCreated)
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(GpuHostMsg_DestroyingVideoSurfaceAck,
                         OnDestroyingVideoSurfaceAck)
@@ -726,29 +724,18 @@ void GpuProcessHost::CreateGpuMemoryBuffer(
   TRACE_EVENT0("gpu", "GpuProcessHost::CreateGpuMemoryBuffer");
 
   DCHECK(CalledOnValidThread());
-
-  GpuMsg_CreateGpuMemoryBuffer_Params params;
-  params.id = id;
-  params.size = size;
-  params.format = format;
-  params.usage = usage;
-  params.client_id = client_id;
-  params.surface_handle = surface_handle;
-  if (Send(new GpuMsg_CreateGpuMemoryBuffer(params))) {
-    create_gpu_memory_buffer_requests_.push(callback);
-  } else {
-    callback.Run(gfx::GpuMemoryBufferHandle());
-  }
+  create_gpu_memory_buffer_requests_.push(callback);
+  gpu_service_ptr_->CreateGpuMemoryBuffer(
+      id, size, format, usage, client_id, surface_handle,
+      base::Bind(&GpuProcessHost::OnGpuMemoryBufferCreated,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 void GpuProcessHost::DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                                             int client_id,
                                             const gpu::SyncToken& sync_token) {
   TRACE_EVENT0("gpu", "GpuProcessHost::DestroyGpuMemoryBuffer");
-
-  DCHECK(CalledOnValidThread());
-
-  Send(new GpuMsg_DestroyGpuMemoryBuffer(id, client_id, sync_token));
+  gpu_service_ptr_->DestroyGpuMemoryBuffer(id, client_id, sync_token);
 }
 
 #if defined(OS_ANDROID)
@@ -809,11 +796,8 @@ void GpuProcessHost::OnGpuMemoryBufferCreated(
     const gfx::GpuMemoryBufferHandle& handle) {
   TRACE_EVENT0("gpu", "GpuProcessHost::OnGpuMemoryBufferCreated");
 
-  if (create_gpu_memory_buffer_requests_.empty())
-    return;
-
-  CreateGpuMemoryBufferCallback callback =
-      create_gpu_memory_buffer_requests_.front();
+  DCHECK(!create_gpu_memory_buffer_requests_.empty());
+  auto callback = create_gpu_memory_buffer_requests_.front();
   create_gpu_memory_buffer_requests_.pop();
   callback.Run(handle);
 }
@@ -1066,8 +1050,7 @@ void GpuProcessHost::SendOutstandingReplies() {
   }
 
   while (!create_gpu_memory_buffer_requests_.empty()) {
-    CreateGpuMemoryBufferCallback callback =
-        create_gpu_memory_buffer_requests_.front();
+    auto callback = create_gpu_memory_buffer_requests_.front();
     create_gpu_memory_buffer_requests_.pop();
     callback.Run(gfx::GpuMemoryBufferHandle());
   }