Pepper: Remove Manifest::ResolveURL

ppapi/native_client/src/trusted/plugin/json_manifest.cc

 /*
  * Copyright (c) 2012 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 <algorithm>
 
 #include "ppapi/native_client/src/trusted/plugin/json_manifest.h"
 
@@ skipping 562 matching lines @@
   const Json::Value& isa_dict = dictionary[key];
   nacl::string relative_url;
   bool uses_nonsfi_mode;
   if (!GetURLFromISADictionary(isa_dict, key, &relative_url,
                                pnacl_options, &uses_nonsfi_mode, error_info)) {
     return false;
   }
   return ResolveURL(relative_url, full_url, error_info);
 }
 
-bool JsonManifest::ResolveURL(const nacl::string& relative_url,
-                              nacl::string* full_url,
-                              ErrorInfo* error_info) const {
-  // The contents of the manifest are resolved relative to the manifest URL.
-  CHECK(url_util_ != NULL);
-  pp::Var resolved_url =
-      url_util_->ResolveRelativeToURL(pp::Var(manifest_base_url_),
-                                      relative_url);
-  if (!resolved_url.is_string()) {
-    error_info->SetReport(
-        PP_NACL_ERROR_MANIFEST_RESOLVE_URL,
-        "could not resolve url '" + relative_url +
-        "' relative to manifest base url '" + manifest_base_url_.c_str() +
-        "'.");
-    return false;
-  }
-  *full_url = resolved_url.AsString();
-  return true;
-}
-
 bool JsonManifest::GetProgramURL(nacl::string* full_url,
                                  PnaclOptions* pnacl_options,
                                  bool* uses_nonsfi_mode,
                                  ErrorInfo* error_info) const {
   if (full_url == NULL || pnacl_options == NULL || error_info == NULL)
     return false;
 
   const Json::Value& program = dictionary_[kProgramKey];
 
   nacl::string nexe_url;
@@ skipping 66 matching lines @@
   }
   if (!files.isMember(rest)) {
     error_info->SetReport(
         PP_NACL_ERROR_MANIFEST_RESOLVE_URL,
         nacl::string("ResolveKey: no such \"files\" entry: ") + key);
     return false;
   }
   return GetKeyUrl(files, rest, full_url, pnacl_options, error_info);
 }
 
+bool JsonManifest::ResolveURL(const nacl::string& relative_url,
+                              nacl::string* full_url,
+                              ErrorInfo* error_info) const {
+  // The contents of the manifest are resolved relative to the manifest URL.
+  CHECK(url_util_ != NULL);
+  pp::Var resolved_url =
+      url_util_->ResolveRelativeToURL(pp::Var(manifest_base_url_),
+                                      relative_url);
+  if (!resolved_url.is_string()) {
+    error_info->SetReport(
+        PP_NACL_ERROR_MANIFEST_RESOLVE_URL,
+        "could not resolve url '" + relative_url +
+        "' relative to manifest base url '" + manifest_base_url_.c_str() +
+        "'.");
+    return false;
+  }
+  *full_url = resolved_url.AsString();
+  return true;
+}
+
 }  // namespace plugin