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

mojo/shell/context.cc

 // Copyright 2013 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/context.h"
 
 #include "build/build_config.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/embedder/embedder.h"
 #include "mojo/gles2/gles2_support_impl.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/service_manager/background_service_loader.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/services/native_viewport/native_viewport_service.h"
 #include "mojo/shell/dynamic_service_loader.h"
 #include "mojo/shell/in_process_dynamic_service_runner.h"
-#include "mojo/shell/network_delegate.h"
 #include "mojo/shell/out_of_process_dynamic_service_runner.h"
 #include "mojo/shell/switches.h"
 #include "mojo/spy/spy.h"
 
 #if defined(OS_LINUX)
 #include "mojo/shell/dbus_service_loader_linux.h"
 #endif  // defined(OS_LINUX)
 
 #if defined(USE_AURA)
 #include "mojo/shell/view_manager_loader.h"
 #endif
 
 namespace mojo {
 namespace shell {
 namespace {
 
+// These mojo: URLs are loaded directly from the local filesystem. They
+// correspond to shared libraries bundled alongside the mojo_shell.
+const char* kLocalMojoURLs[] = {
+  "mojo:mojo_network_service",
+};
+
 // Used to ensure we only init once.
 class Setup {
  public:
   Setup() {
     embedder::Init();
     gles2::GLES2SupportImpl::Init();
   }
 
   ~Setup() {
   }
@@ skipping 21 matching lines @@
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
   }
 
   Context* context_;
   scoped_ptr<Application> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportServiceLoader);
 };
 
 Context::Context()
-    : task_runners_(base::MessageLoop::current()->message_loop_proxy()),
-      storage_(),
-      loader_(task_runners_.io_runner(),
-              task_runners_.file_runner(),
-              task_runners_.cache_runner(),
-              scoped_ptr<net::NetworkDelegate>(new NetworkDelegate()),
-              storage_.profile_path()) {
+    : task_runners_(base::MessageLoop::current()->message_loop_proxy()) {
   setup.Get();
+
+  for (size_t i = 0; i < arraysize(kLocalMojoURLs); ++i)
+    mojo_url_resolver_.AddLocalFileMapping(GURL(kLocalMojoURLs[i]));
+
   base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   scoped_ptr<DynamicServiceRunnerFactory> runner_factory;
   if (cmdline->HasSwitch(switches::kEnableMultiprocess))
     runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
 
   service_manager_.set_default_loader(
       scoped_ptr<ServiceLoader>(
           new DynamicServiceLoader(this, runner_factory.Pass())));
@@ skipping 33 matching lines @@
 #if defined(USE_AURA)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(),
       GURL("mojo:mojo_view_manager"));
 #endif
   service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
 }
 
 }  // namespace shell
 }  // namespace mojo