Move more files from chrome/browser/nacl_host/ to components/nacl/browser/

components/nacl/browser/nacl_process_host.h

Index: components/nacl/browser/nacl_process_host.h
diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
similarity index 96%
rename from chrome/browser/nacl_host/nacl_process_host.h
rename to components/nacl/browser/nacl_process_host.h
index 82a4f738e33db450956a8250ea94d50cae9b64c0..6207b2a4d4e51d538cbdefbb3d9474d22e9a2e8c 100644
--- a/chrome/browser/nacl_host/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
-#define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
+#ifndef COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
+#define COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
 
 #include "build/build_config.h"
 
@@ -22,7 +22,6 @@
 #include "url/gurl.h"
 
 class CommandLine;
-class NaClHostMessageFilter;
 
 namespace content {
 class BrowserChildProcessHost;
@@ -34,8 +33,8 @@ class ChannelProxy;
 }
 
 namespace nacl {

[Mark Seaborn, 2013/11/21 23:47:34]

Add empty line after this line

+class NaClHostMessageFilter;
 void* AllocateAddressSpaceASLR(base::ProcessHandle process, size_t size);
-}
 
 // Represents the browser side of the browser <--> NaCl communication
 // channel. There will be one NaClProcessHost per NaCl process
@@ -78,7 +77,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
 
   // Initialize the new NaCl process. Result is returned by sending ipc
   // message reply_msg.
-  void Launch(NaClHostMessageFilter* nacl_host_message_filter,
+  void Launch(nacl::NaClHostMessageFilter* nacl_host_message_filter,

[Mark Seaborn, 2013/11/21 23:47:34]

"nacl::" prefix not needed.  Same below.

               IPC::Message* reply_msg,
               const base::FilePath& manifest_path);
 
@@ -191,7 +190,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
 #endif
   // The NaClHostMessageFilter that requested this NaCl process.  We use
   // this for sending the reply once the process has started.
-  scoped_refptr<NaClHostMessageFilter> nacl_host_message_filter_;
+  scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter_;
 
   // The reply message to send. We must always send this message when the
   // sub-process either succeeds or fails to unblock the renderer waiting for
@@ -236,4 +235,6 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };
 
-#endif  // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
+}  // namespace nacl
+
+#endif  // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_