Move core pieces of browser\renderer_host to src\content.

chrome/browser/nacl_host/nacl_process_host.h

 // Copyright (c) 2010 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_
 #pragma once
 
 #include "build/build_config.h"
 
 #include "base/ref_counted.h"
 #include "chrome/browser/browser_child_process_host.h"
 #include "chrome/common/nacl_types.h"
-#include "native_client/src/shared/imc/nacl_imc.h"
 
 class RenderMessageFilter;
 
 // 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 BrowserChildProcessHost {
  public:
   NaClProcessHost(ResourceDispatcherHost *resource_dispatcher_host,
                   const std::wstring& url);
   ~NaClProcessHost();
 
   // Initialize the new NaCl process, returning true on success.
   bool Launch(RenderMessageFilter* render_message_filter,
               int socket_count,
               IPC::Message* reply_msg);
 
   virtual bool OnMessageReceived(const IPC::Message& msg);
 
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
 
  protected:
   virtual base::TerminationStatus GetChildTerminationStatus(int* exit_code);
   virtual void OnChildDied();
 
  private:
+  // Internal class that holds the nacl::Handle objecs so that
+  // nacl_process_host.h doesn't include NaCl headers.  Needed since it's
+  // included by src\content, which can't depend on the NaCl gyp file because it
+  // depends on chrome.gyp (circular dependency).
+  struct NaClInternal;
+
   bool LaunchSelLdr();
 
   void SendStartMessage();
 
   virtual void OnProcessLaunched();
 
   virtual bool CanShutdown();
 
 #if defined(OS_WIN)
   // Check whether the browser process is running on WOW64 - Windows only
   void CheckIsWow64();
 #endif
 
  private:
   ResourceDispatcherHost* resource_dispatcher_host_;
 
   // The RenderMessageFilter that requested this NaCl process.  We use this
   // for sending the reply once the process has started.
   scoped_refptr<RenderMessageFilter> render_message_filter_;
 
   // The reply message to send.
   IPC::Message* reply_msg_;
 
   // Socket pairs for the NaCl process and renderer.
-  std::vector<nacl::Handle> sockets_for_renderer_;
-  std::vector<nacl::Handle> sockets_for_sel_ldr_;
+  scoped_ptr<NaClInternal> internal_;
 
   // Windows platform flag
   bool running_on_wow64_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };
 
 #endif  // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_