Refactor NaClProcessHost. Reduce chances to leak the resource.

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 <vector>
@@ skipping 94 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:
+  class ScopedChannelHandle;
+
   void 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 10 matching lines @@
   // BrowserChildProcessHostDelegate implementation:
   bool OnMessageReceived(const IPC::Message& msg) override;
   void OnProcessLaunched() override;
 
   void OnResourcesReady();
 
   // Enable the PPAPI proxy only for NaCl processes corresponding to a renderer.
   bool enable_ppapi_proxy() { return render_view_id_ != 0; }
 
   // Sends the reply message to the renderer who is waiting for the plugin
-  // to load. Returns true on success.
-  bool ReplyToRenderer(
-      const IPC::ChannelHandle& ppapi_channel_handle,
-      const IPC::ChannelHandle& trusted_channel_handle,
-      const IPC::ChannelHandle& manifest_service_channel_handle);
+  // to load.
+  void ReplyToRenderer(ScopedChannelHandle ppapi_channel_handle,
+                       ScopedChannelHandle trusted_channel_handle,
+                       ScopedChannelHandle manifest_service_channel_handle);
 
   // Sends the reply with error message to the renderer.
   void SendErrorToRenderer(const std::string& error_message);
 
   // Sends the reply message to the renderer. Either result or
   // error message must be empty.
-  void SendMessageToRenderer(const NaClLaunchResult& result,
+  bool SendMessageToRenderer(const NaClLaunchResult& result,
                              const std::string& error_message);
 
   // Sends the message to the NaCl process to load the plugin. Returns true
   // on success.
   bool StartNaClExecution();
 
   void StartNaClFileResolved(
       NaClStartParams params,
       const base::FilePath& file_path,
       base::File nexe_file);
@@ skipping 86 matching lines @@
   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_