NaCl: Use RAII for sockets in NaClProcessHost.

components/nacl/browser/nacl_process_host.h

Index: components/nacl/browser/nacl_process_host.h
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index cae9b7308518e0c76343eb8c6495d6eb12892c57..35c3b5c441aa01224d6350893d6c127feb921b23 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -107,12 +107,6 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   content::BrowserPpapiHost* browser_ppapi_host() { return ppapi_host_.get(); }
 
  private:
-  // Internal class that holds the NaClHandle 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 LaunchNaClGdb();
 
   // Mark the process as using a particular GDB debug stub port and notify
@@ -224,9 +218,6 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   // debug the NaCl loader.
   base::FilePath manifest_path_;
 
-  // Socket pairs for the NaCl process and renderer.
-  scoped_ptr<NaClInternal> internal_;
-
   scoped_ptr<content::BrowserChildProcessHost> process_;
 
   bool uses_irt_;
@@ -255,6 +246,9 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   // reporting crash information.
   base::SharedMemory crash_info_shmem_;
 
+  base::File socket_for_renderer_;
+  base::File socket_for_sel_ldr_;
+
   base::WeakPtrFactory<NaClProcessHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);