NaCl: Use RAII for sockets in NaClProcessHost.

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 COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
 #define COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
 
 #include "build/build_config.h"
 
 #include "base/files/file.h"
@@ skipping 89 matching lines @@
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
   void OnDebugExceptionHandlerLaunchedByBroker(bool success);
 #endif
 
   bool Send(IPC::Message* msg);
 
   content::BrowserChildProcessHost* process() { return process_.get(); }
   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
   // listeners (if the port is not kGdbDebugStubPortUnknown).
   void SetDebugStubPort(int port);
 
 #if defined(OS_POSIX)
   // Create bound TCP socket in the browser process so that the NaCl GDB debug
   // stub can use it to accept incoming connections even when the Chrome sandbox
   // is enabled.
@@ skipping 91 matching lines @@
   IPC::Message* reply_msg_;
 #if defined(OS_WIN)
   bool debug_exception_handler_requested_;
   scoped_ptr<IPC::Message> attach_debug_exception_handler_reply_msg_;
 #endif
 
   // The file path to the manifest is passed to nacl-gdb when it is used to
   // 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_;
   bool uses_nonsfi_mode_;
 
   bool enable_debug_stub_;
   bool enable_dyncode_syscalls_;
   bool enable_exception_handling_;
   bool enable_crash_throttling_;
 
   bool off_the_record_;
 
   const base::FilePath profile_directory_;
 
   // Channel proxy to terminate the NaCl-Browser PPAPI channel.
   scoped_ptr<IPC::ChannelProxy> ipc_proxy_channel_;
   // Browser host for plugin process.
   scoped_ptr<content::BrowserPpapiHost> ppapi_host_;
 
   int render_view_id_;
 
   // Throttling time in milliseconds for PpapiHostMsg_Keepalive IPCs.
   static unsigned keepalive_throttle_interval_milliseconds_;
 
   // Shared memory provided to the plugin and renderer for
   // 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);
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_