Refactor params of NaClProcessMsg_Start.

components/nacl/common/nacl_types.cc

Index: components/nacl/common/nacl_types.cc
diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc
index 616657c9a3161d97d4ac47b8ccd7369a85c8a9f5..44a545da85cbc811296fad5ddce5ff12fa4d3fb0 100644
--- a/components/nacl/common/nacl_types.cc
+++ b/components/nacl/common/nacl_types.cc
@@ -9,6 +9,14 @@ namespace nacl {
 
 NaClStartParams::NaClStartParams()
     : nexe_file(IPC::InvalidPlatformFileForTransit()),
+      imc_bootstrap_handle(IPC::InvalidPlatformFileForTransit()),
+      irt_handle(IPC::InvalidPlatformFileForTransit()),
+#if defined(OS_MACOSX)
+      mac_shm_fd(IPC::InvalidPlatformFileForTransit()),
+#endif
+#if defined(OS_POSIX)
+      debug_stub_server_bound_socket(IPC::InvalidPlatformFileForTransit()),
+#endif
       validation_cache_enabled(false),
       enable_debug_stub(false),
       enable_ipc_proxy(false),
@@ -19,18 +27,31 @@ NaClStartParams::NaClStartParams()
 NaClStartParams::~NaClStartParams() {
 }
 
-NaClResourceFileInfo::NaClResourceFileInfo()
+NaClResourcePrefetchResult::NaClResourcePrefetchResult()
     : file(IPC::InvalidPlatformFileForTransit()) {
 }
 
-NaClResourceFileInfo::NaClResourceFileInfo(
+NaClResourcePrefetchResult::NaClResourcePrefetchResult(
     IPC::PlatformFileForTransit file,
     const base::FilePath& file_path_metadata,
     const std::string& file_key)
     : file(file), file_path_metadata(file_path_metadata), file_key(file_key) {
 }
 
-NaClResourceFileInfo::~NaClResourceFileInfo() {
+NaClResourcePrefetchResult::~NaClResourcePrefetchResult() {
+}
+
+NaClResourcePrefetchRequest::NaClResourcePrefetchRequest() {
+}
+
+NaClResourcePrefetchRequest::NaClResourcePrefetchRequest(
+    const std::string& file_key,
+    const std::string& resource_url)
+    : file_key(file_key),
+      resource_url(resource_url) {
+}
+
+NaClResourcePrefetchRequest::~NaClResourcePrefetchRequest() {
 }
 
 NaClLaunchParams::NaClLaunchParams()
@@ -47,7 +68,8 @@ NaClLaunchParams::NaClLaunchParams(
     const IPC::PlatformFileForTransit& nexe_file,
     uint64_t nexe_token_lo,
     uint64_t nexe_token_hi,
-    const base::StringPairs& resource_files_to_prefetch,
+    const std::vector<
+        NaClResourcePrefetchRequest>& resource_prefetch_request_list,
     int render_view_id,
     uint32 permission_bits,
     bool uses_nonsfi_mode,
@@ -56,7 +78,7 @@ NaClLaunchParams::NaClLaunchParams(
       nexe_file(nexe_file),
       nexe_token_lo(nexe_token_lo),
       nexe_token_hi(nexe_token_hi),
-      resource_files_to_prefetch(resource_files_to_prefetch),
+      resource_prefetch_request_list(resource_prefetch_request_list),
       render_view_id(render_view_id),
       permission_bits(permission_bits),
       uses_nonsfi_mode(uses_nonsfi_mode),