Pepper: Remove Manifest::ResolveURL

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

Index: ppapi/native_client/src/trusted/plugin/json_manifest.h
diff --git a/ppapi/native_client/src/trusted/plugin/json_manifest.h b/ppapi/native_client/src/trusted/plugin/json_manifest.h
index e56d4469761e58ad54f9ed189bf0dbcad290aa92..e71abebaa6a854830cb71662595b25d983b1f27e 100644
--- a/ppapi/native_client/src/trusted/plugin/json_manifest.h
+++ b/ppapi/native_client/src/trusted/plugin/json_manifest.h
@@ -53,11 +53,6 @@ class JsonManifest : public Manifest {
                              bool* uses_nonsfi_mode,
                              ErrorInfo* error_info) const;
 
-  // Resolves a URL relative to the manifest base URL
-  virtual bool ResolveURL(const nacl::string& relative_url,
-                          nacl::string* full_url,
-                          ErrorInfo* error_info) const;
-
   // Gets the file names from the "files" section of the manifest.  No
   // checking that the keys' values are proper ISA dictionaries -- it
   // is assumed that other consistency checks take care of that, and
@@ -76,6 +71,11 @@ class JsonManifest : public Manifest {
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(JsonManifest);
 
+  // Resolves a URL relative to the manifest base URL
+  bool ResolveURL(const nacl::string& relative_url,
+                  nacl::string* full_url,
+                  ErrorInfo* error_info) const;

[dmichael (off chromium), 2014/04/10 16:48:01]

nit: This should probably also be moved in the body to keep the methods in
consistent order.

+
   // Checks that |dictionary_| is a valid manifest, according to the schema.
   // Returns true on success, and sets |error_info| to a detailed message
   // if not.