Convert NaCl renderer-browser messages to mojo.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 5912d5771b59d834fabdce9579bd1da893d845e1..e7783c690936e8d63196db3934365340cfd88308 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -312,7 +312,7 @@
 
 #if !defined(DISABLE_NACL)
 #include "components/nacl/browser/nacl_browser.h"
-#include "components/nacl/browser/nacl_host_message_filter.h"
+#include "components/nacl/browser/nacl_host_impl.h"
 #include "components/nacl/browser/nacl_process_host.h"
 #include "components/nacl/common/nacl_process_type.h"
 #include "components/nacl/common/nacl_switches.h"
@@ -1188,14 +1188,6 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch(
           audio_debug_recordings_handler));
 
 #endif
-#if !defined(DISABLE_NACL)
-  net::URLRequestContextGetter* context =
-      host->GetStoragePartition()->GetURLRequestContext();
-  host->AddFilter(new nacl::NaClHostMessageFilter(
-      id, profile->IsOffTheRecord(),
-      profile->GetPath(),
-      context));
-#endif
 #if defined(OS_ANDROID)
   host->AddFilter(new cdm::CdmMessageFilterAndroid());
 #endif
@@ -3093,6 +3085,13 @@ void ChromeContentBrowserClient::ExposeInterfacesToRenderer(
       base::Bind(&metrics::LeakDetectorRemoteController::Create),
       ui_task_runner);
 #endif
+#if !defined(DISABLE_NACL)
+  Profile* profile =
+      Profile::FromBrowserContext(render_process_host->GetBrowserContext());
+  registry->AddInterface(
+      base::Bind(&nacl::NaClHostImpl::Create, render_process_host->GetID(),
+                 profile->IsOffTheRecord(), profile->GetPath()));
+#endif
 }
 
 void ChromeContentBrowserClient::ExposeInterfacesToMediaService(