Refactor params of NaClProcessMsg_Start.

components/nacl/common/nacl_types.h

 // Copyright 2013 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_COMMON_NACL_TYPES_H_
 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 40 matching lines @@
   kNativeNaClProcessType,
   // Runs user-provided code that is translated from *bitcode* by an
   // in-browser PNaCl translator.
   kPNaClProcessType,
   // Runs pnacl-llc/linker *native* code. These nexes are browser-provided
   // (not user-provided).
   kPNaClTranslatorProcessType,
   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
   std::string file_key;  // a key for open_resource
 };
 
 // Parameters sent to the NaCl process when we start it.
 struct NaClStartParams {
   NaClStartParams();
   ~NaClStartParams();
 
   IPC::PlatformFileForTransit nexe_file;
   // 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;
   // Chrome version string. Sending the version string over IPC avoids linkage
   // issues in cases where NaCl is not compiled into the main Chromium
   // executable or DLL.
   std::string version;
 
   bool enable_debug_stub;
   bool enable_ipc_proxy;
@@ skipping 15 matching lines @@
 //
 // If you change this, you will also need to update the IPC serialization in
 // nacl_host_messages.h.
 struct NaClLaunchParams {
   NaClLaunchParams();
   NaClLaunchParams(
       const std::string& manifest_url,
       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,
       NaClAppProcessType process_type);
   ~NaClLaunchParams();
 
   std::string manifest_url;
   // On Windows, the HANDLE passed here is valid in the renderer's context.
   // It's the responsibility of the browser to duplicate this handle properly
   // for passing it to the plugin.
   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;
   bool uses_nonsfi_mode;
 
   NaClAppProcessType process_type;
 };
 
 struct NaClLaunchResult {
   NaClLaunchResult();
@@ skipping 23 matching lines @@
   base::ProcessId plugin_pid;
   int plugin_child_id;
 
   // For NaCl <-> renderer crash information reporting.
   base::SharedMemoryHandle crash_info_shmem_handle;
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_COMMON_NACL_TYPES_H_