Convert NaCl renderer-loader messages to mojo.

components/nacl/loader/nacl_listener.cc

Index: components/nacl/loader/nacl_listener.cc
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
index 300b47f58c8a6fe5262cf60360f5c7557b08134f..adba94ab6945bdba8e6a5d0d24c1c2d948836acc 100644
--- a/components/nacl/loader/nacl_listener.cc
+++ b/components/nacl/loader/nacl_listener.cc
@@ -24,8 +24,8 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
+#include "components/nacl/common/nacl.mojom.h"
 #include "components/nacl/common/nacl_messages.h"
-#include "components/nacl/common/nacl_renderer_messages.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/nacl/loader/nacl_ipc_adapter.h"
 #include "components/nacl/loader/nacl_validation_db.h"
@@ -76,9 +76,8 @@ void FatalLogHandler(const char* data, size_t bytes) {
 }
 
 void LoadStatusCallback(int load_status) {
-  g_listener->trusted_listener()->Send(
-      new NaClRendererMsg_ReportLoadStatus(
-          static_cast<NaClErrorCode>(load_status)));
+  g_listener->trusted_listener()->renderer_host()->ReportLoadStatus(
+      static_cast<NaClErrorCode>(load_status));
 }
 
 #if defined(OS_LINUX)
@@ -350,9 +349,11 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
       base::Bind(&NaClListener::OnOpenResource, base::Unretained(this)));
 
   mojo::MessagePipe trusted_pipe;
-  trusted_listener_ =
-      new NaClTrustedListener(trusted_pipe.handle0.release(),
-                              io_thread_.task_runner().get(), &shutdown_event_);
+  trusted_listener_ = base::MakeUnique<NaClTrustedListener>(
+      mojo::MakeProxy(nacl::mojom::NaClRendererHostPtrInfo(
+          std::move(trusted_pipe.handle0),
+          nacl::mojom::NaClRendererHost::Version_)),

[dcheng, 2016/12/20 06:49:54]

Nit: can we document what "version" means somewhere? I looked at
InterfacePtrInfo, and don't really understand what it means for this to be 0 vs
something else. Perhaps it's related to mojom versioning?

[Sam McNally, 2016/12/20 10:02:19]

Yes, it's for mojom versioning.
https://www.chromium.org/developers/design-documents/mojo/versioning doesn't
seem to cover this part. Since this interface isn't versioned it doesn't
actually matter here.

In this case, since this is sending the pipe handle, it can start with the nice
type and extract the pipe handle instead of building the nice type from the pipe
handle. Once the other NaCl IPCs are converted, the pipe won't need to be
visible here.

+      io_thread_.task_runner().get());
   if (!Send(new NaClProcessHostMsg_PpapiChannelsCreated(
           browser_handle, ppapi_renderer_handle, trusted_pipe.handle1.release(),
           manifest_service_handle)))
@@ -446,7 +447,7 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
     NaClExit(1);
 
   // Report the plugin's exit status if the application started successfully.
-  trusted_listener_->Send(new NaClRendererMsg_ReportExitStatus(exit_status));
+  trusted_listener_->renderer_host()->ReportExitStatus(exit_status);
   NaClExit(exit_status);
 }