mojo: allow BackgroundServiceLoader-loaded apps to Quit themselves.

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_impl.h"
-#include "mojo/service_manager/background_service_loader.h"
+#include "mojo/service_manager/background_shell_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/out_of_process_dynamic_service_runner.h"
 #include "mojo/shell/switches.h"
 #include "mojo/shell/ui_service_loader_android.h"
 #include "mojo/spy/spy.h"
 
@@ skipping 84 matching lines @@
   // don't run it on its own thread we can easily deadlock. Long term native
   // viewport should run its own process so that this isn't an issue.
 #if defined(OS_ANDROID)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(
           new UIServiceLoader(
               scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader()),
               this)),
       GURL("mojo:mojo_native_viewport_service"));
 #else
-  service_manager_.SetLoaderForURL(
-      scoped_ptr<ServiceLoader>(
-          new BackgroundServiceLoader(
-              scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader()),
-              "native_viewport",
-              base::MessageLoop::TYPE_UI)),
-      GURL("mojo:mojo_native_viewport_service"));
+  {
+    scoped_ptr<BackgroundShellServiceLoader> loader(
+        new BackgroundShellServiceLoader(
+            scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader()),
+            "native_viewport",
+             base::MessageLoop::TYPE_UI));
+    // TODO(tim): NativeViewportService doesn't quit itself yet.
+    loader->set_quit_on_shutdown();
+    service_manager_.SetLoaderForURL(
+        loader.PassAs<ServiceLoader>(),
+        GURL("mojo:mojo_native_viewport_service"));
+  }
 #endif
 #if defined(USE_AURA)
   // TODO(sky): need a better way to find this. It shouldn't be linked in.
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(new ViewManagerLoader()),
       GURL("mojo:mojo_view_manager"));
 #endif
 
 #if defined(OS_LINUX)
   service_manager_.SetLoaderForScheme(
       scoped_ptr<ServiceLoader>(new DBusServiceLoader(this)),
       "dbus");
 #endif  // defined(OS_LINUX)
 
   if (cmdline->HasSwitch(switches::kSpy)) {
     spy_.reset(new mojo::Spy(&service_manager_,
                              cmdline->GetSwitchValueASCII(switches::kSpy)));
   }
 
 #if defined(OS_ANDROID)
   // On android, the network service is bundled with the shell because the
   // network stack depends on the android runtime.
-  service_manager_.SetLoaderForURL(
-      scoped_ptr<ServiceLoader>(
-          new BackgroundServiceLoader(
-              scoped_ptr<ServiceLoader>(new NetworkServiceLoader()),
-              "network_service",
-              base::MessageLoop::TYPE_IO)),
-      GURL("mojo:mojo_network_service"));
+  {
+    scoped_ptr<BackgroundShellServiceLoader> loader(
+        new BackgroundShellServiceLoader(
+            scoped_ptr<ServiceLoader>(new NetworkServiceLoader()),
+            "network_service",
+             base::MessageLoop::TYPE_IO));
+    // TODO(tim): NetworkService doesn't quit itself yet.
+    loader->set_quit_on_shutdown();
+    service_manager_.SetLoaderForURL(loader.PassAs<ServiceLoader>(),
+                                     GURL("mojo:mojo_network_service"));
+  }
 #endif
 }
 
 void Context::Shutdown() {
   // mojo_view_manager uses native_viewport. Destroy mojo_view_manager first so
   // that there aren't shutdown ordering issues. Once native viewport service is
   // moved into its own process this can likely be nuked.
 #if defined(USE_AURA)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(),
       GURL("mojo:mojo_view_manager"));
 #endif
   service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
   service_manager_.TerminateShellConnections();
 }
 
 Context::~Context() {
   DCHECK(!base::MessageLoop::current());
   Shutdown();
 }
 
 }  // namespace shell
 }  // namespace mojo