Reduce resource leak code for StartNaClExecution.

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 80e2a0ad0d3e86d0f7db7801a565b69300f2768d..e229e996554f7deb90e73f9f677b059ff59cfa11 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -74,7 +74,8 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
       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,
@@ -160,10 +161,11 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   // 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)
@@ -208,7 +210,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   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_;