Refactor params of NaClProcessMsg_Start.

components/nacl/renderer/ppb_nacl_private_impl.cc

 // 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.
 
 #include "components/nacl/renderer/ppb_nacl_private_impl.h"
 
 #include <numeric>
 #include <string>
 #include <vector>
 
@@ skipping 403 matching lines @@
   if (load_manager->DevInterfacesEnabled())
     perm_bits |= ppapi::PERMISSION_DEV;
   instance_info.permissions =
       ppapi::PpapiPermissions::GetForCommandLine(perm_bits);
   std::string error_message_string;
   NaClLaunchResult launch_result;
 
   IPC::PlatformFileForTransit nexe_for_transit =
       IPC::InvalidPlatformFileForTransit();
 
-  std::vector<std::pair<
-    std::string /*key*/, std::string /*url*/> > resource_files_to_prefetch;
+  std::vector<NaClResourcePrefetchInfo> resource_prefetch_info_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) {
+      std::vector<
+          std::pair<std::string /*key*/, std::string /*url*/> > candidates;
+      manifest->GetPrefetchableFiles(&candidates);

[Mark Seaborn, 2015/04/23 00:10:11]

Would it make sense for GetPrefetchableFiles to use NaClResourcePrefetchInfo
instead of std::vector too?

[hidehiko, 2015/04/23 11:51:29]

Done.

+      for (size_t i = 0; i < candidates.size(); ++i) {
+        const GURL gurl(candidates[i].second);
+        // Important security check. Do not remove.
+        if (!CanOpenViaFastPath(plugin_instance, gurl)) {
+          resource_prefetch_info_list.clear();
+          break;
+        }
+        resource_prefetch_info_list.push_back(NaClResourcePrefetchInfo(
+            candidates[i].first, candidates[i].second));
       }
     }
   }
 
 #if defined(OS_POSIX)
   if (nexe_file_info->handle != PP_kInvalidFileHandle)
     nexe_for_transit = base::FileDescriptor(nexe_file_info->handle, true);
 #elif defined(OS_WIN)
   // Duplicate the handle on the browser side instead of the renderer.
   // This is because BrokerGetFileForProcess isn't part of content/public, and
   // it's simpler to do the duplication in the browser anyway.
   nexe_for_transit = nexe_file_info->handle;
 #else
 #error Unsupported target platform.
 #endif
   if (!sender->Send(new NaClHostMsg_LaunchNaCl(
           NaClLaunchParams(
               instance_info.url.spec(),
               nexe_for_transit,
               nexe_file_info->token_lo,
               nexe_file_info->token_hi,
-              resource_files_to_prefetch,
+              resource_prefetch_info_list,
               routing_id,
               perm_bits,
               PP_ToBool(uses_nonsfi_mode),
               process_type),
           &launch_result,
           &error_message_string))) {
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
         FROM_HERE,
         base::Bind(callback.func, callback.user_data,
                    static_cast<int32_t>(PP_ERROR_FAILED)));
@@ skipping 1259 matching lines @@
   &StreamPexe
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl