Refactor params of NaClProcessMsg_Start.

components/nacl/renderer/ppb_nacl_private_impl.cc

Index: components/nacl/renderer/ppb_nacl_private_impl.cc
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 2f3cd586f6cc490224ab63b751a0c1d4acd00bf5..865a4c95a16e1e9735d52a3b16cebe8429602bd8 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -420,18 +420,19 @@ void LaunchSelLdr(PP_Instance instance,
   IPC::PlatformFileForTransit nexe_for_transit =
       IPC::InvalidPlatformFileForTransit();
 
-  std::vector<std::pair<
-    std::string /*key*/, std::string /*url*/> > resource_files_to_prefetch;
+  std::vector<NaClResourcePrefetchRequest> resource_prefetch_request_list;
   if (process_type == kNativeNaClProcessType && uses_nonsfi_mode) {
     JsonManifest* manifest = GetJsonManifest(instance);
-    if (manifest)
-      manifest->GetPrefetchableFiles(&resource_files_to_prefetch);
-    for (size_t i = 0; i < resource_files_to_prefetch.size(); ++i) {
-      const GURL gurl(resource_files_to_prefetch[i].second);
-      // Important security check. Do not remove.
-      if (!CanOpenViaFastPath(plugin_instance, gurl)) {
-        resource_files_to_prefetch.clear();
-        break;
+    if (manifest) {
+      manifest->GetPrefetchableFiles(&resource_prefetch_request_list);
+
+      for (size_t i = 0; i < resource_prefetch_request_list.size(); ++i) {
+        const GURL gurl(resource_prefetch_request_list[i].resource_url);
+        // Important security check. Do not remove.
+        if (!CanOpenViaFastPath(plugin_instance, gurl)) {
+          resource_prefetch_request_list.clear();
+          break;
+        }
       }
     }
   }
@@ -453,7 +454,7 @@ void LaunchSelLdr(PP_Instance instance,
               nexe_for_transit,
               nexe_file_info->token_lo,
               nexe_file_info->token_hi,
-              resource_files_to_prefetch,
+              resource_prefetch_request_list,
               routing_id,
               perm_bits,
               PP_ToBool(uses_nonsfi_mode),