Separate NaCl messages from the rest of chrome messages and create a new message filter. This is pa…

chrome/renderer/pepper/ppb_nacl_private_impl.cc

Index: chrome/renderer/pepper/ppb_nacl_private_impl.cc
diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc
index dab0726076ac47388bbd504080b0448959d13716..14bb89ccbccf852d713fe020bfa356b830f6e0ea 100644
--- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc
+++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc
@@ -10,8 +10,8 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
+#include "chrome/browser/nacl_host/nacl_host_messages.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/render_messages.h"
 #include "chrome/renderer/chrome_render_process_observer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
@@ -102,7 +102,7 @@ PP_NaClResult LaunchSelLdr(PP_Instance instance,
   instance_info.permissions =
       ppapi::PpapiPermissions::GetForCommandLine(perm_bits);
 
-  if (!sender->Send(new ChromeViewHostMsg_LaunchNaCl(
+  if (!sender->Send(new NaClHostMsg_LaunchNaCl(
           nacl::NaClLaunchParams(instance_info.url.spec(),
                                  routing_id,
                                  perm_bits,
@@ -211,7 +211,7 @@ PP_FileHandle GetReadonlyPnaclFD(const char* filename) {
   if (sender == NULL)
     sender = g_background_thread_sender.Pointer()->get();
 
-  if (!sender->Send(new ChromeViewHostMsg_GetReadonlyPnaclFD(
+  if (!sender->Send(new NaClHostMsg_GetReadonlyPnaclFD(
           std::string(filename),
           &out_fd))) {
     return base::kInvalidPlatformFileValue;
@@ -232,7 +232,7 @@ PP_FileHandle CreateTemporaryFile(PP_Instance instance) {
   if (sender == NULL)
     sender = g_background_thread_sender.Pointer()->get();
 
-  if (!sender->Send(new ChromeViewHostMsg_NaClCreateTemporaryFile(
+  if (!sender->Send(new NaClHostMsg_NaClCreateTemporaryFile(
           &transit_fd))) {
     return base::kInvalidPlatformFileValue;
   }
@@ -260,7 +260,7 @@ PP_NaClResult ReportNaClError(PP_Instance instance,
   IPC::Sender* sender = content::RenderThread::Get();
 
   if (!sender->Send(
-          new ChromeViewHostMsg_NaClErrorStatus(
+          new NaClHostMsg_NaClErrorStatus(
               // TODO(dschuff): does this enum need to be sent as an int,
               // or is it safe to include the appropriate headers in
               // render_messages.h?
@@ -283,7 +283,7 @@ PP_FileHandle OpenNaClExecutable(PP_Instance instance,
   *nonce_hi = 0;
   base::FilePath file_path;
   if (!sender->Send(
-      new ChromeViewHostMsg_OpenNaClExecutable(GetRoutingID(instance),
+      new NaClHostMsg_OpenNaClExecutable(GetRoutingID(instance),
                                                GURL(file_url),
                                                &out_fd,
                                                nonce_lo,