Android: decouple mojo shell from the network service.

mojo/shell/mojo_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/shell/mojo_url_resolver.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 12 matching lines @@
   GURL::Replacements replacements;
   replacements.SetPathStr(path);
   return url.ReplaceComponents(replacements);
 }
 
 }  // namespace
 
 MojoURLResolver::MojoURLResolver() {
   // Needed to treat first component of mojo URLs as host, not path.
   url::AddStandardScheme("mojo");
-
-  // By default, resolve mojo URLs to files living alongside the shell.
+  // By default, apps bundled with the shell reside alongside the shell.

[qsr, 2014/12/05 17:02:58]

There is no bundle when we run mojo_shell in the output directory. Why did you
change this comment?

[ppi, 2014/12/10 16:21:00]

Fixed, ptal.

I changed it because I found it confusing at the first read - the comment as it
is now is more about what happens in ::Resolve than what happens here.

   base::FilePath path;
   PathService::Get(base::DIR_MODULE, &path);
-  default_base_url_ = AddTrailingSlashIfNeeded(FilePathToFileURL(path));
+  local_apps_url_ = AddTrailingSlashIfNeeded(FilePathToFileURL(path));
 }
 
 MojoURLResolver::~MojoURLResolver() {
 }
 
 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 MojoURLResolver::SetLocalAppsPath(const base::FilePath& local_apps_path) {
+  local_apps_url_ =
+      AddTrailingSlashIfNeeded(FilePathToFileURL(local_apps_path));
+  DCHECK(local_apps_url_.is_valid());
+}
+
 void MojoURLResolver::AddCustomMapping(const GURL& mojo_url,
                                        const GURL& resolved_url) {
   url_map_[mojo_url] = resolved_url;
 }
 
 void MojoURLResolver::AddLocalFileMapping(const GURL& mojo_url) {
   local_file_set_.insert(mojo_url);
 }
 
 GURL MojoURLResolver::Resolve(const GURL& mojo_url) const {
   const GURL mapped_url(ApplyCustomMappings(mojo_url));
 
   // Continue resolving if the mapped url is a mojo: url.
   if (mapped_url.scheme() != "mojo")
     return mapped_url;
 
   std::string lib = mapped_url.host() + ".mojo";
 
   if (!base_url_.is_valid() ||
       local_file_set_.find(mapped_url) != local_file_set_.end()) {
     // Resolve to a local file URL.
-    return default_base_url_.Resolve(lib);
+    return local_apps_url_.Resolve(lib);
   }
 
   // Otherwise, resolve to an URL relative to base_url_.
   return 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