Revert 287680 "mojo: terminate apps if the shell goes away"

trunk/src/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"
@@ skipping 104 matching lines @@
               scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader()),
               this)),
       GURL("mojo:mojo_native_viewport_service"));
 #else
   {
     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"));
@@ skipping 12 matching lines @@
 
 #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<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