Convert NaCl renderer-browser messages to mojo.

components/nacl/browser/nacl_file_host.cc

Index: components/nacl/browser/nacl_file_host.cc
diff --git a/components/nacl/browser/nacl_file_host.cc b/components/nacl/browser/nacl_file_host.cc
index 4c1cdb68f6986767c2bcfaf958d982cbcfaac621..3e523ff4e66bb80dd5c8e2d53230123389547782 100644
--- a/components/nacl/browser/nacl_file_host.cc
+++ b/components/nacl/browser/nacl_file_host.cc
@@ -17,15 +17,13 @@
 #include "components/nacl/browser/bad_message.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/browser/nacl_browser_delegate.h"
-#include "components/nacl/browser/nacl_host_message_filter.h"
-#include "components/nacl/common/nacl_host_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
-#include "ipc/ipc_platform_file.h"
 
 using content::BrowserThread;
 
+namespace nacl_file_host {
 namespace {
 
 // Force a prefix to prevent user from opening "magic" files.
@@ -36,23 +34,17 @@ const char* kExpectedFilePrefix = "pnacl_public_";
 const size_t kMaxFileLength = 40;
 
 void NotifyRendererOfError(
-    nacl::NaClHostMessageFilter* nacl_host_message_filter,
-    IPC::Message* reply_msg) {
-  reply_msg->set_reply_error();
-  nacl_host_message_filter->Send(reply_msg);
+    const scoped_refptr<base::TaskRunner>& origin_task_runner,
+    const OpenFileCallback& callback) {
+  origin_task_runner->PostTask(
+      FROM_HERE, base::Bind(callback, base::Passed(base::File()), 0, 0));
 }
 
-typedef void (*WriteFileInfoReply)(IPC::Message* reply_msg,
-                                   const IPC::PlatformFileForTransit& file_desc,
-                                   const uint64_t& file_token_lo,
-                                   const uint64_t& file_token_hi);
-
 void DoRegisterOpenedNaClExecutableFile(
-    scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
     base::File file,
     base::FilePath file_path,
-    IPC::Message* reply_msg,
-    WriteFileInfoReply write_reply_message) {
+    const scoped_refptr<base::TaskRunner>& origin_task_runner,
+    const OpenFileCallback& callback) {
   // IO thread owns the NaClBrowser singleton.
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
@@ -61,18 +53,15 @@ void DoRegisterOpenedNaClExecutableFile(
   uint64_t file_token_hi = 0;
   nacl_browser->PutFilePath(file_path, &file_token_lo, &file_token_hi);
 
-  IPC::PlatformFileForTransit file_desc =
-      IPC::TakePlatformFileForTransit(std::move(file));
-
-  write_reply_message(reply_msg, file_desc, file_token_lo, file_token_hi);
-  nacl_host_message_filter->Send(reply_msg);
+  origin_task_runner->PostTask(
+      FROM_HERE,
+      base::Bind(callback, base::Passed(&file), file_token_lo, file_token_hi));
 }
 
-void DoOpenPnaclFile(
-    scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
-    const std::string& filename,
-    bool is_executable,
-    IPC::Message* reply_msg) {
+void DoOpenPnaclFile(const std::string& filename,
+                     bool is_executable,
+                     const scoped_refptr<base::TaskRunner>& origin_task_runner,
+                     const OpenFileCallback& callback) {
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   base::FilePath full_filepath;
 
@@ -80,20 +69,20 @@ void DoOpenPnaclFile(
   base::FilePath pnacl_dir;
   if (!nacl::NaClBrowser::GetDelegate()->GetPnaclDirectory(&pnacl_dir) ||
       !base::PathExists(pnacl_dir)) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
+    NotifyRendererOfError(origin_task_runner, callback);
     return;
   }
 
   // Do some validation.
   if (!nacl_file_host::PnaclCanOpenFile(filename, &full_filepath)) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
+    NotifyRendererOfError(origin_task_runner, callback);
     return;
   }
 
   base::File file_to_open = nacl::OpenNaClReadExecImpl(full_filepath,
                                                        is_executable);
   if (!file_to_open.IsValid()) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
+    NotifyRendererOfError(origin_task_runner, callback);
     return;
   }
 
@@ -104,18 +93,13 @@ void DoOpenPnaclFile(
   if (is_executable) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        base::Bind(&DoRegisterOpenedNaClExecutableFile,
-                   nacl_host_message_filter, Passed(std::move(file_to_open)),
-                   full_filepath, reply_msg,
-                   static_cast<WriteFileInfoReply>(
-                       NaClHostMsg_GetReadonlyPnaclFD::WriteReplyParams)));
+        base::Bind(&DoRegisterOpenedNaClExecutableFile, Passed(&file_to_open),
+                   full_filepath, origin_task_runner, callback));
   } else {
-    IPC::PlatformFileForTransit target_desc =
-        IPC::TakePlatformFileForTransit(std::move(file_to_open));
-    uint64_t dummy_file_token = 0;
-    NaClHostMsg_GetReadonlyPnaclFD::WriteReplyParams(
-        reply_msg, target_desc, dummy_file_token, dummy_file_token);
-    nacl_host_message_filter->Send(reply_msg);
+    constexpr uint64_t kDummyFileToken = 0;
+    origin_task_runner->PostTask(
+        FROM_HERE, base::Bind(callback, base::Passed(&file_to_open),
+                              kDummyFileToken, kDummyFileToken));
   }
 }
 
@@ -123,19 +107,18 @@ void DoOpenPnaclFile(
 // This function is security sensitive.  Be sure to check with a security
 // person before you modify it.
 void DoOpenNaClExecutableOnThreadPool(
-    scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
     const GURL& file_url,
     bool enable_validation_caching,
-    IPC::Message* reply_msg) {
+    const base::FilePath& profile_directory,
+    const scoped_refptr<base::TaskRunner>& origin_task_runner,
+    const OpenFileCallback& callback) {
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   base::FilePath file_path;
   if (!nacl::NaClBrowser::GetDelegate()->MapUrlToLocalFilePath(
-          file_url,
-          true /* use_blocking_api */,
-          nacl_host_message_filter->profile_directory(),
+          file_url, true /* use_blocking_api */, profile_directory,
           &file_path)) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
+    NotifyRendererOfError(origin_task_runner, callback);
     return;
   }
 
@@ -152,42 +135,30 @@ void DoOpenNaClExecutableOnThreadPool(
       // registered in a structure owned by the IO thread.
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
-          base::Bind(&DoRegisterOpenedNaClExecutableFile,
-                     nacl_host_message_filter, Passed(std::move(file)),
-                     file_path, reply_msg,
-                     static_cast<WriteFileInfoReply>(
-                         NaClHostMsg_OpenNaClExecutable::WriteReplyParams)));
+          base::Bind(&DoRegisterOpenedNaClExecutableFile, Passed(&file),
+                     file_path, origin_task_runner, callback));
     } else {
-      IPC::PlatformFileForTransit file_desc =
-          IPC::TakePlatformFileForTransit(std::move(file));
-      uint64_t dummy_file_token = 0;
-      NaClHostMsg_OpenNaClExecutable::WriteReplyParams(
-          reply_msg, file_desc, dummy_file_token, dummy_file_token);
-      nacl_host_message_filter->Send(reply_msg);
+      constexpr uint64_t kDummyFileToken = 0;
+      origin_task_runner->PostTask(
+          FROM_HERE, base::Bind(callback, base::Passed(&file), kDummyFileToken,
+                                kDummyFileToken));
     }
   } else {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
+    NotifyRendererOfError(origin_task_runner, callback);
     return;
   }
 }
 
 }  // namespace
 
-namespace nacl_file_host {
-
-void GetReadonlyPnaclFd(
-    scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
-    const std::string& filename,
-    bool is_executable,
-    IPC::Message* reply_msg) {
+void GetReadonlyPnaclFd(const std::string& filename,
+                        bool is_executable,
+                        const OpenFileCallback& callback) {
   if (!BrowserThread::PostBlockingPoolTask(
           FROM_HERE,
-          base::Bind(&DoOpenPnaclFile,
-                     nacl_host_message_filter,
-                     filename,
-                     is_executable,
-                     reply_msg))) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
+          base::Bind(&DoOpenPnaclFile, filename, is_executable,
+                     base::ThreadTaskRunnerHandle::Get(), callback))) {
+    NotifyRendererOfError(base::ThreadTaskRunnerHandle::Get(), callback);
   }
 }
 
@@ -225,41 +196,40 @@ bool PnaclCanOpenFile(const std::string& filename,
 }
 
 void OpenNaClExecutable(
-    scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
     int render_view_id,
     const GURL& file_url,
     bool enable_validation_caching,
-    IPC::Message* reply_msg) {
+    int render_process_id,
+    const base::FilePath& profile_directory,
+    const scoped_refptr<base::TaskRunner>& origin_task_runner,
+    const OpenFileCallback& callback) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(
-            &OpenNaClExecutable,
-            nacl_host_message_filter,
-            render_view_id,
-            file_url,
-            enable_validation_caching,
-            reply_msg));
+        base::Bind(&OpenNaClExecutable, render_view_id, file_url,
+                   enable_validation_caching, render_process_id,
+                   profile_directory, origin_task_runner, callback));
     return;
   }
 
   // Make sure render_view_id is valid and that the URL is a part of the
   // render view's site. Without these checks, apps could probe the extension
   // directory or run NaCl code from other extensions.
-  content::RenderViewHost* rvh = content::RenderViewHost::FromID(
-      nacl_host_message_filter->render_process_id(), render_view_id);
+  content::RenderViewHost* rvh =
+      content::RenderViewHost::FromID(render_process_id, render_view_id);
   if (!rvh) {
     nacl::bad_message::ReceivedBadMessage(
-        nacl_host_message_filter.get(),
+        render_process_id,
         nacl::bad_message::NFH_OPEN_EXECUTABLE_BAD_ROUTING_ID);
-    delete reply_msg;
+    // The callback must be called even if the message was invalid.
+    NotifyRendererOfError(origin_task_runner, callback);
     return;
   }
   content::SiteInstance* site_instance = rvh->GetSiteInstance();
   if (!content::SiteInstance::IsSameWebSite(site_instance->GetBrowserContext(),
                                             site_instance->GetSiteURL(),
                                             file_url)) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
+    NotifyRendererOfError(origin_task_runner, callback);
     return;
   }
 
@@ -267,14 +237,10 @@ void OpenNaClExecutable(
   // file path and convert that to a file descriptor. This should be done on a
   // blocking pool thread.
   if (!BrowserThread::PostBlockingPoolTask(
-      FROM_HERE,
-      base::Bind(
-          &DoOpenNaClExecutableOnThreadPool,
-          nacl_host_message_filter,
-          file_url,
-          enable_validation_caching,
-          reply_msg))) {
-    NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
+          FROM_HERE, base::Bind(&DoOpenNaClExecutableOnThreadPool, file_url,
+                                enable_validation_caching, profile_directory,
+                                origin_task_runner, callback))) {
+    NotifyRendererOfError(origin_task_runner, callback);
   }
 }