Android: decouple mojo shell from the network service.

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 "shell/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 20 matching lines @@
 #include "shell/in_process_dynamic_service_runner.h"
 #include "shell/out_of_process_dynamic_service_runner.h"
 #include "shell/switches.h"
 #include "shell/ui_application_loader_android.h"
 #include "url/gurl.h"
 
 #if defined(OS_ANDROID)
 #include "services/gles2/gpu_impl.h"
 #include "services/native_viewport/native_viewport_impl.h"
 #include "shell/android/android_handler_loader.h"
-#include "shell/network_application_loader.h"
 #endif  // defined(OS_ANDROID)
 
 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:network_service",
@@ skipping 193 matching lines @@
   if (command_line->HasSwitch(switches::kSpy)) {
     spy_.reset(
         new mojo::Spy(&application_manager_,
                       command_line->GetSwitchValueASCII(switches::kSpy)));
     // TODO(cpu): the spy can snoop, but can't tell anybody until
     // the Spy::WebSocketDelegate is implemented. In the original repo this
     // was implemented by src\mojo\spy\websocket_server.h and .cc.
   }
 
 #if defined(OS_ANDROID)
-  // On android, the network service is bundled with the shell because the
-  // network stack depends on the android runtime.
   {
-    scoped_ptr<BackgroundShellApplicationLoader> loader(
-        new BackgroundShellApplicationLoader(
-            scoped_ptr<ApplicationLoader>(new NetworkApplicationLoader()),
-            "network_service", base::MessageLoop::TYPE_IO));
-    application_manager_.SetLoaderForURL(loader.Pass(),
-                                         GURL("mojo:network_service"));
-  }
-  {
+    // Android handler is bundled with the Mojo shell, because it uses the
+    // MojoShell application as the JNI bridge to bootstrap execution of other
+    // Android Mojo apps that need JNI.
     scoped_ptr<BackgroundShellApplicationLoader> loader(
         new BackgroundShellApplicationLoader(
             scoped_ptr<ApplicationLoader>(new AndroidHandlerLoader()),
             "android_handler", base::MessageLoop::TYPE_DEFAULT));
     application_manager_.SetLoaderForURL(loader.Pass(),
                                          GURL("mojo:android_handler"));
   }
 #endif
 
   tracing::TraceDataCollectorPtr trace_data_collector_ptr;
@@ skipping 31 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(application_url,
                                                      service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo