Refactor params of NaClProcessMsg_Start.

components/nacl/common/nacl_types.h

Index: components/nacl/common/nacl_types.h
diff --git a/components/nacl/common/nacl_types.h b/components/nacl/common/nacl_types.h
index f691edf9b2f7c6068efb3f686337ada1e994b7b6..ebb64f7a82c6fe13e89df787950ac15226d031b3 100644
--- a/components/nacl/common/nacl_types.h
+++ b/components/nacl/common/nacl_types.h
@@ -58,14 +58,25 @@ enum NaClAppProcessType {
   kNumNaClProcessTypes
 };
 
+// Request to prefetch a resource file.

[Mark Seaborn, 2015/04/24 00:53:24]

Please make the comment match up with NaClResourcePrefetchResult, which says:

// Represents a single prefetched file that's listed in the "files" section of
// a NaCl manifest file.

[hidehiko, 2015/04/24 10:05:17]

Done.

+struct NaClResourcePrefetchRequest {
+  NaClResourcePrefetchRequest();

[Mark Seaborn, 2015/04/24 00:53:25]

Not used?  Avoiding defining a default ctor would be beneficial.

[hidehiko, 2015/04/24 10:05:17]

Used by IPC framework.

+  NaClResourcePrefetchRequest(const std::string& file_key,
+                              const std::string& resource_url);
+  ~NaClResourcePrefetchRequest();
+
+  std::string file_key;

[Mark Seaborn, 2015/04/24 00:53:24]

Add comment "// a key for open_resource" to match NaClResourcePrefetchResult

[hidehiko, 2015/04/24 10:05:17]

Done.

+  std::string resource_url;
+};
+
 // Represents a single prefetched file that's listed in the "files" section of
 // a NaCl manifest file.
-struct NaClResourceFileInfo {
-  NaClResourceFileInfo();
-  NaClResourceFileInfo(IPC::PlatformFileForTransit file,
-                       const base::FilePath& file_path,
-                       const std::string& file_key);
-  ~NaClResourceFileInfo();
+struct NaClResourcePrefetchResult {
+  NaClResourcePrefetchResult();

[Mark Seaborn, 2015/04/24 00:53:24]

Is this default ctor unused now?

[hidehiko, 2015/04/24 10:05:18]

Acknowledged.

+  NaClResourcePrefetchResult(IPC::PlatformFileForTransit file,
+                             const base::FilePath& file_path,
+                             const std::string& file_key);
+  ~NaClResourcePrefetchResult();
 
   IPC::PlatformFileForTransit file;
   base::FilePath file_path_metadata;  // a key for validation caching
@@ -81,9 +92,11 @@ struct NaClStartParams {
   // Used only as a key for validation caching.
   base::FilePath nexe_file_path_metadata;
 
-  std::vector<NaClResourceFileInfo> prefetched_resource_files;
-  std::vector<FileDescriptor> handles;
-  FileDescriptor debug_stub_server_bound_socket;
+  std::vector<NaClResourcePrefetchResult> prefetched_resource_files;
+  IPC::PlatformFileForTransit imc_bootstrap_handle;
+  IPC::PlatformFileForTransit irt_handle;
+  IPC::PlatformFileForTransit mac_shm_fd;

[Mark Seaborn, 2015/04/24 00:53:24]

Can you comment that this is only used on Mac OS X?  Or better, put this in an
#ifdef.

[hidehiko, 2015/04/24 10:05:17]

Done.

+  IPC::PlatformFileForTransit debug_stub_server_bound_socket;
 
   bool validation_cache_enabled;
   std::string validation_cache_key;
@@ -119,9 +132,8 @@ struct NaClLaunchParams {
       const IPC::PlatformFileForTransit& nexe_file,
       uint64_t nexe_token_lo,
       uint64_t nexe_token_hi,
-      // A pair of a manifest key and its resource URL.
       const std::vector<
-        std::pair<std::string, std::string> >& resource_files_to_prefetch,
+          NaClResourcePrefetchRequest>& resource_prefetch_request_list,
       int render_view_id,
       uint32 permission_bits,
       bool uses_nonsfi_mode,
@@ -135,7 +147,7 @@ struct NaClLaunchParams {
   IPC::PlatformFileForTransit nexe_file;
   uint64_t nexe_token_lo;
   uint64_t nexe_token_hi;
-  std::vector<std::pair<std::string, std::string> > resource_files_to_prefetch;
+  std::vector<NaClResourcePrefetchRequest> resource_prefetch_request_list;
 
   int render_view_id;
   uint32 permission_bits;