Move runner stuff into a runner namespace.

mojo/runner/url_resolver.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 "mojo/runner/url_resolver.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/runner/switches.h"
 #include "mojo/shell/query_util.h"
 #include "mojo/util/filename_util.h"
 #include "url/url_util.h"
 
 namespace mojo {
-namespace shell {
+namespace runner {
 
 URLResolver::URLResolver() {
   // Needed to treat first component of mojo URLs as host, not path.
   url::AddStandardScheme("mojo");
 }
 
 URLResolver::~URLResolver() {
 }
 
 // static
@@ skipping 38 matching lines @@
     // Disallow invalid mappings.
     LOG(ERROR) << "Invalid origin for mapping: " << origin;
     return;
   }
   // Force both origin and base_url to have trailing slashes.
   origin_map_[origin] = util::AddTrailingSlashIfNeeded(base_url);
 }
 
 GURL URLResolver::ApplyMappings(const GURL& url) const {
   std::string query;
-  GURL mapped_url = GetBaseURLAndQuery(url, &query);
+  GURL mapped_url = shell::GetBaseURLAndQuery(url, &query);
   for (;;) {
     const auto& url_it = url_map_.find(mapped_url);
     if (url_it != url_map_.end()) {
       mapped_url = url_it->second;
       continue;
     }
 
     GURL origin = mapped_url.GetOrigin();
     const auto& origin_it = origin_map_.find(origin);
     if (origin_it == origin_map_.end())
@@ skipping 15 matching lines @@
 }
 
 GURL URLResolver::ResolveMojoURL(const GURL& mojo_url) const {
   if (mojo_url.scheme() != "mojo") {
     // The mapping has produced some sort of non-mojo: URL - file:, http:, etc.
     return mojo_url;
   }
 
   // It's still a mojo: URL, use the default mapping scheme.
   std::string query;
-  GURL base_url = GetBaseURLAndQuery(mojo_url, &query);
+  GURL base_url = shell::GetBaseURLAndQuery(mojo_url, &query);
   if (mojo_base_url_.SchemeIsFile()) {
     const GURL url_with_directory(
         mojo_base_url_.Resolve(base_url.host() + "/"));
     const base::FilePath file_path(util::UrlToFilePath(url_with_directory));
     if (base::DirectoryExists(file_path))
       return url_with_directory.Resolve(base_url.host() + ".mojo" + query);
   }
   return mojo_base_url_.Resolve(base_url.host() + ".mojo" + query);
 }
 
-}  // namespace shell
+}  // namespace runner
 }  // namespace mojo