Mojo: Use network service to load non-local Mojo Apps.

mojo/shell/context.h

Index: mojo/shell/context.h
diff --git a/mojo/shell/context.h b/mojo/shell/context.h
index 599a199b9f1338b6e2a2a7904530e0c70a4d6af6..c643cd933171b2da2a3ce01798257794c2750eda 100644
--- a/mojo/shell/context.h
+++ b/mojo/shell/context.h
@@ -9,8 +9,7 @@
 
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/shell/keep_alive.h"
-#include "mojo/shell/loader.h"
-#include "mojo/shell/storage.h"
+#include "mojo/shell/mojo_url_resolver.h"
 #include "mojo/shell/task_runners.h"
 
 #if defined(OS_ANDROID)
@@ -31,16 +30,10 @@ class Context {
   Context();
   ~Context();
 
-  const std::string& mojo_origin() const { return mojo_origin_; }
-  void set_mojo_origin(const std::string& mojo_origin) {
-    mojo_origin_ = mojo_origin;
-  }
-
   TaskRunners* task_runners() { return &task_runners_; }
-  Storage* storage() { return &storage_; }
-  Loader* loader() { return &loader_; }
   ServiceManager* service_manager() { return &service_manager_; }
   KeepAliveCounter* keep_alive_counter() { return &keep_alive_counter_; }
+  MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; }
 
 #if defined(OS_ANDROID)
   jobject activity() const { return activity_.obj(); }
@@ -50,12 +43,9 @@ class Context {
  private:
   class NativeViewportServiceLoader;
 
-  std::string mojo_origin_;
-
   TaskRunners task_runners_;
-  Storage storage_;
-  Loader loader_;
   ServiceManager service_manager_;
+  MojoURLResolver mojo_url_resolver_;
   scoped_ptr<Spy> spy_;
 #if defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> activity_;