Android: decouple mojo shell from the network service.

mojo/shell/mojo_url_resolver.h

Index: mojo/shell/mojo_url_resolver.h
diff --git a/mojo/shell/mojo_url_resolver.h b/mojo/shell/mojo_url_resolver.h
index b7145dd98a6b859e67bddc0e2769869787f51764..9fc1b9dc938997c6b0493bc7cbee131a15b0178d 100644
--- a/mojo/shell/mojo_url_resolver.h
+++ b/mojo/shell/mojo_url_resolver.h
@@ -9,6 +9,7 @@
 #include <set>
 
 #include "base/basictypes.h"
+#include "base/files/file_path.h"
 #include "url/gurl.h"
 
 namespace mojo {
@@ -28,12 +29,15 @@ class MojoURLResolver {
   // inserted.
   void SetBaseURL(const GURL& base_url);
 
+  // Set the location of applications bundled with the Mojo Shell.
+  void SetLocalAppsPath(const base::FilePath& local_apps_path);
+
   // Add a custom mapping for a particular "mojo:" URL. If |resolved_url| is
   // itself a mojo url normal resolution rules apply.
   void AddCustomMapping(const GURL& mojo_url, const GURL& resolved_url);
 
   // Add a local file mapping for a particular "mojo:" URL. This causes the
-  // "mojo:" URL to be resolved to a base::DIR_MODULE-relative shared library.
+  // "mojo:" URL to be resolved to a local_apps_url_-relative shared library.

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

having the _ here is weird. Also please specify that base::DIR_MODULE is the
default.

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

Done.

   void AddLocalFileMapping(const GURL& mojo_url);
 
   // Resolve the given "mojo:" URL to the URL that should be used to fetch the
@@ -48,7 +52,7 @@ class MojoURLResolver {
 
   std::map<GURL, GURL> url_map_;
   std::set<GURL> local_file_set_;
-  GURL default_base_url_;
+  GURL local_apps_url_;
   GURL base_url_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoURLResolver);