gpu: Replace more chrome ipc with mojom API.

content/browser/gpu/gpu_process_host_ui_shim.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 25 matching lines @@
 namespace {
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
 base::LazyInstance<IDMap<GpuProcessHostUIShim*>> g_hosts_by_id =
     LAZY_INSTANCE_INITIALIZER;
 
-void SendOnIOThreadTask(int host_id, IPC::Message* msg) {
-  GpuProcessHost* host = GpuProcessHost::FromID(host_id);
-  if (host)
-    host->Send(msg);
-  else
-    delete msg;
-}
-
 void StopGpuProcessOnIO(int host_id) {
   GpuProcessHost* host = GpuProcessHost::FromID(host_id);
   if (host)
     host->StopGpuProcess();
 }
 
 }  // namespace
 
 void RouteToGpuProcessHostUIShimTask(int host_id, const IPC::Message& msg) {
   GpuProcessHostUIShim* ui_shim = GpuProcessHostUIShim::FromID(host_id);
@@ skipping 51 matching lines @@
 
 // static
 GpuProcessHostUIShim* GpuProcessHostUIShim::GetOneInstance() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (g_hosts_by_id.Pointer()->IsEmpty())
     return NULL;
   IDMap<GpuProcessHostUIShim*>::iterator it(g_hosts_by_id.Pointer());
   return it.GetCurrentValue();
 }
 
-bool GpuProcessHostUIShim::Send(IPC::Message* msg) {
-  DCHECK(CalledOnValidThread());
-  return BrowserThread::PostTask(BrowserThread::IO,
-                                 FROM_HERE,
-                                 base::Bind(&SendOnIOThreadTask,
-                                            host_id_,
-                                            msg));
-}
-
 bool GpuProcessHostUIShim::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
 
 #if defined(USE_OZONE)
   if (ui::OzonePlatform::GetInstance()
           ->GetGpuPlatformSupportHost()
           ->OnMessageReceived(message))
     return true;
 #endif
 
   if (message.routing_id() != MSG_ROUTING_CONTROL)
     return false;
 
   return OnControlMessageReceived(message);
 }
 
 void GpuProcessHostUIShim::StopGpuProcess(const base::Closure& callback) {
   close_callback_ = callback;
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, base::Bind(&StopGpuProcessOnIO, host_id_));
 }
 
 void GpuProcessHostUIShim::SimulateRemoveAllContext() {
-  Send(new GpuMsg_Clean());
+  GpuProcessHost::CallOnIO(GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED,

[jbauman, 2017/03/01 22:04:26]

We should have a version of CallOnIO that takes host_id_, so we can be sure that
the GpuProcessHost that receives the message is the same that was around when
these calls are made.

[jbauman, 2017/03/01 22:43:04]

For example, these should all be done on the SANDBOXED gpu process host, so
that's why they're not working.

[sadrul, 2017/03/02 03:36:54]

Fixed, thanks for catching these!

I did a little more cleanup at the same time: turns out, these functions are
called from just one place: debug_urls.cc (and Crash() is also called in a
test). So I updated those code to directly call GpuProcessHost::CallOnIO()
instead. This also allowed the removal of GpuProcessHostUIShim::GetOneInstance()
(which I find somewhat weird)

+                           false /* force_create */,
+                           base::Bind([](GpuProcessHost* host) {
+                             host->gpu_service()->DestroyAllChannels();
+                           }));
 }
 
 void GpuProcessHostUIShim::SimulateCrash() {
-  Send(new GpuMsg_Crash());
+  GpuProcessHost::CallOnIO(
+      GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED, false /* force_create */,
+      base::Bind([](GpuProcessHost* host) { host->gpu_service()->Crash(); }));
 }
 
 void GpuProcessHostUIShim::SimulateHang() {
-  Send(new GpuMsg_Hang());
+  GpuProcessHost::CallOnIO(
+      GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED, false /* force_create */,
+      base::Bind([](GpuProcessHost* host) { host->gpu_service()->Hang(); }));
 }
 
 #if defined(OS_ANDROID)
 void GpuProcessHostUIShim::SimulateJavaCrash() {
-  Send(new GpuMsg_JavaCrash());
+  GpuProcessHost::CallOnIO(GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED,
+                           false /* force_create */,
+                           base::Bind([](GpuProcessHost* host) {
+                             host->gpu_service()->ThrowJavaException();
+                           }));
 }
 #endif
 
 GpuProcessHostUIShim::~GpuProcessHostUIShim() {
   DCHECK(CalledOnValidThread());
   if (!close_callback_.is_null())
     base::ResetAndReturn(&close_callback_).Run();
   g_hosts_by_id.Pointer()->Remove(host_id_);
 }
 
@@ skipping 23 matching lines @@
 void GpuProcessHostUIShim::OnGraphicsInfoCollected(
     const gpu::GPUInfo& gpu_info) {
   // OnGraphicsInfoCollected is sent back after the GPU process successfully
   // initializes GL.
   TRACE_EVENT0("test_gpu", "OnGraphicsInfoCollected");
 
   GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info);
 }
 
 }  // namespace content