Reduce resource leak code for StartNaClExecution.

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 56 matching lines @@
   // render_view_id: RenderView routing id, to control access to private APIs.
   // permission_bits: controls which interfaces the NaCl plugin can use.
   // uses_nonsfi_mode: whether the program should be loaded under non-SFI mode.
   // off_the_record: was the process launched from an incognito renderer?
   // process_type: the type of NaCl process.
   // profile_directory: is the path of current profile directory.
   NaClProcessHost(
       const GURL& manifest_url,
       base::File nexe_file,
       const NaClFileToken& nexe_token,
-      const std::vector<NaClResourcePrefetchResult>& prefetched_resource_files,
+      const std::vector<NaClResourcePrefetchRequest>&
+          resource_prefetch_request_list,
       ppapi::PpapiPermissions permissions,
       int render_view_id,
       uint32 permission_bits,
       bool uses_nonsfi_mode,
       bool off_the_record,
       NaClAppProcessType process_type,
       const base::FilePath& profile_directory);
   ~NaClProcessHost() override;
 
   void OnProcessCrashed(int exit_status) override;
@@ skipping 65 matching lines @@
   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,
                              const std::string& error_message);
 
   // Sends the message to the NaCl process to load the plugin. Returns true
   // on success.
   bool StartNaClExecution();
-
-  void StartNaClFileResolved(
+  void StartNaClExecutionAfterFileResolved(
       NaClStartParams params,
-      const base::FilePath& file_path,
+      scoped_ptr<base::FilePath> nexe_file_path,
+      scoped_ptr<std::vector<NaClResourcePrefetchResult> >
+          prefetched_resource_files,
       base::File nexe_file);
 
 #if defined(OS_LINUX)
   // Creates a pair of IPC::ChannelHandle. Returns true on success.
   static bool CreateChannelHandlePair(ScopedChannelHandle* channel_handle1,
                                       ScopedChannelHandle* channel_handle2);
 #endif
 
   // Starts browser PPAPI proxy. Returns true on success.
   bool StartPPAPIProxy(ScopedChannelHandle channel_handle);
@@ skipping 24 matching lines @@
   // created.
   void OnPpapiChannelsCreated(
       const IPC::ChannelHandle& ppapi_browser_channel_handle,
       const IPC::ChannelHandle& ppapi_renderer_channel_handle,
       const IPC::ChannelHandle& trusted_renderer_channel_handle,
       const IPC::ChannelHandle& manifest_service_channel_handle);
 
   GURL manifest_url_;
   base::File nexe_file_;
   NaClFileToken nexe_token_;
-  std::vector<NaClResourcePrefetchResult> prefetched_resource_files_;
+  std::vector<NaClResourcePrefetchRequest> resource_prefetch_request_list_;
 
   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.
@@ skipping 41 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_