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

components/nacl/browser/nacl_process_host.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util_proxy.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process.h"
 #include "components/nacl/common/nacl_types.h"
 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/socket/socket_descriptor.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "url/gurl.h"
 
 class CommandLine;
-class NaClHostMessageFilter;
 
 namespace content {
 class BrowserChildProcessHost;
 class BrowserPpapiHost;
 }
 
 namespace IPC {
 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
 // The browser is responsible for starting the NaCl process
 // when requested by the renderer.
 // After that, most of the communication is directly between NaCl plugin
 // running in the renderer and NaCl processes.
 class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
  public:
   // manifest_url: the URL of the manifest of the Native Client plugin being
@@ skipping 22 matching lines @@
                   const base::FilePath& profile_directory);
   virtual ~NaClProcessHost();
 
   virtual void OnProcessCrashed(int exit_status) OVERRIDE;
 
   // Do any minimal work that must be done at browser startup.
   static void EarlyStartup();
 
   // 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);
 
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
 
 #if defined(OS_WIN)
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
   void OnDebugExceptionHandlerLaunchedByBroker(bool success);
 #endif
 
@@ skipping 92 matching lines @@
   GURL manifest_url_;
   ppapi::PpapiPermissions permissions_;
 
 #if defined(OS_WIN)
   // This field becomes true when the broker successfully launched
   // the NaCl loader.
   bool process_launched_by_broker_;
 #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
   // the reply. NULL when there is no reply to send.
   IPC::Message* reply_msg_;
 #if defined(OS_WIN)
   bool debug_exception_handler_requested_;
   scoped_ptr<IPC::Message> attach_debug_exception_handler_reply_msg_;
 #endif
 
@@ skipping 24 matching lines @@
   // Plugin listener, to forward browser channel messages to us.
   PluginListener ipc_plugin_listener_;
   // Browser host for plugin process.
   scoped_ptr<content::BrowserPpapiHost> ppapi_host_;
 
   int render_view_id_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };
 
-#endif  // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
+}  // namespace nacl
+
+#endif  // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_