Refactor params of NaClProcessMsg_Start.

components/nacl/renderer/json_manifest.cc

 // Copyright 2014 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/json_manifest.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "components/nacl/common/nacl_types.h"
 #include "components/nacl/renderer/nexe_load_manager.h"
 #include "third_party/jsoncpp/source/include/json/reader.h"
 #include "third_party/jsoncpp/source/include/json/value.h"
 #include "url/gurl.h"
 
 namespace nacl {
 
 namespace {
 // Top-level section name keys
 const char* const kProgramKey =     "program";
@@ skipping 414 matching lines @@
     error_info->string =
         "could not resolve url '" + nexe_url +
         "' relative to manifest base url '" + manifest_base_url_.c_str() +
         "'.";
     return false;
   }
   *full_url = resolved_gurl.possibly_invalid_spec();
   return true;
 }
 
-void JsonManifest::GetPrefetchableFiles(base::StringPairs* out_files) const {
+void JsonManifest::GetPrefetchableFiles(
+    std::vector<NaClResourcePrefetchRequest>* out_files) const {
   const Json::Value& files = dictionary_[kFilesKey];
   if (!files.isObject())
     return;
 
   Json::Value::Members keys = files.getMemberNames();
   for (size_t i = 0; i < keys.size(); ++i) {
     std::string full_url;
     PP_PNaClOptions unused_pnacl_options;  // pnacl does not support "files".
     // We skip invalid entries in "files".
     if (GetKeyUrl(files, keys[i], &full_url, &unused_pnacl_options)) {
       if (GURL(full_url).SchemeIs("chrome-extension"))
-        out_files->push_back(std::make_pair(keys[i], full_url));
+        out_files->push_back(NaClResourcePrefetchRequest(keys[i], full_url));
     }
   }
 }
 
 bool JsonManifest::ResolveKey(const std::string& key,
                               std::string* full_url,
                               PP_PNaClOptions* pnacl_options) const {
   if (full_url == NULL || pnacl_options == NULL)
     return false;
 
@@ skipping 176 matching lines @@
   } else {
     // NaCl
     *url = isa_spec[kUrlKey].asString();
     pnacl_options->translate = PP_FALSE;
   }
 
   return true;
 }
 
 }  // namespace nacl