Rename MojoURLResolver to URLResolver

shell/url_resolver.cc

Index: shell/url_resolver.cc
diff --git a/shell/mojo_url_resolver.cc b/shell/url_resolver.cc
similarity index 59%
rename from shell/mojo_url_resolver.cc
rename to shell/url_resolver.cc
index 9e93aa1142763a71f68a09f947258f07670bf8e8..837b80c9cea437c772494d67a21605c6ab035090 100644
--- a/shell/mojo_url_resolver.cc
+++ b/shell/url_resolver.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shell/mojo_url_resolver.h"
+#include "shell/url_resolver.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
@@ -13,28 +13,38 @@
 namespace mojo {
 namespace shell {
 
-MojoURLResolver::MojoURLResolver() {
+URLResolver::URLResolver() {
   // Needed to treat first component of mojo URLs as host, not path.
   url::AddStandardScheme("mojo");
 }
 
-MojoURLResolver::~MojoURLResolver() {
+URLResolver::~URLResolver() {
 }
 
-void MojoURLResolver::SetBaseURL(const GURL& base_url) {
-  DCHECK(base_url.is_valid());
-  // Force a trailing slash on the base_url to simplify resolving
-  // relative files and URLs below.
-  base_url_ = AddTrailingSlashIfNeeded(base_url);
+void URLResolver::AddURLMapping(const GURL& url, const GURL& resolved_url) {
+  url_map_[url] = resolved_url;
+}
+
+GURL URLResolver::ApplyURLMappings(const GURL& url) const {
+  GURL mapped_url(url);
+  for (;;) {
+    const auto& it = url_map_.find(mapped_url);
+    if (it == url_map_.end())
+      break;
+    mapped_url = it->second;
+  }
+  return mapped_url;
 }
 
-void MojoURLResolver::AddCustomMapping(const GURL& mojo_url,
-                                       const GURL& resolved_url) {
-  url_map_[mojo_url] = resolved_url;
+void URLResolver::SetMojoBaseURL(const GURL& mojo_base_url) {
+  DCHECK(mojo_base_url.is_valid());
+  // Force a trailing slash on the base_url to simplify resolving
+  // relative files and URLs below.
+  mojo_base_url_ = AddTrailingSlashIfNeeded(mojo_base_url);
 }
 
-GURL MojoURLResolver::Resolve(const GURL& mojo_url) const {
-  const GURL mapped_url(ApplyCustomMappings(mojo_url));
+GURL URLResolver::ResolveMojoURL(const GURL& mojo_url) const {
+  const GURL mapped_url(ApplyURLMappings(mojo_url));
 
   if (mapped_url.scheme() != "mojo") {
     // The mapping has produced some sort of non-mojo: URL - file:, http:, etc.
@@ -42,20 +52,9 @@ GURL MojoURLResolver::Resolve(const GURL& mojo_url) const {
   } else {
     // It's still a mojo: URL, use the default mapping scheme.
     std::string lib = mapped_url.host() + ".mojo";
-    return base_url_.Resolve(lib);
+    return mojo_base_url_.Resolve(lib);
   }
 }
 
-GURL MojoURLResolver::ApplyCustomMappings(const GURL& url) const {
-  GURL mapped_url(url);
-  for (;;) {
-    std::map<GURL, GURL>::const_iterator it = url_map_.find(mapped_url);
-    if (it == url_map_.end())
-      break;
-    mapped_url = it->second;
-  }
-  return mapped_url;
-}
-
 }  // namespace shell
 }  // namespace mojo