Use of base::StringPairs appropriately in nacl.

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>
 
 #include "base/basictypes.h"
 #include "base/memory/shared_memory.h"
 #include "base/process/process_handle.h"
+#include "base/strings/string_split.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_platform_file.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>   // for HANDLE
@@ skipping 79 matching lines @@
   // serialization in nacl_messages.h and (for POD fields) the constructor
   // in nacl_types.cc.
 };
 
 // Parameters sent to the browser process to have it launch a NaCl process.
 //
 // 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,
-      int render_view_id,
-      uint32 permission_bits,
-      bool uses_nonsfi_mode,
-      NaClAppProcessType process_type);
+  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 base::StringPairs& resource_files_to_prefetch,
+                   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;
+  base::StringPairs resource_files_to_prefetch;
 
   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_