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

trunk/src/mojo/service_manager/background_shell_service_loader.cc

 // Copyright 2014 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/service_manager/background_shell_service_loader.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "mojo/service_manager/service_manager.h"
 
@@ skipping 17 matching lines @@
  private:
   ServiceLoader* loader_;  // Owned by BackgroundShellServiceLoader
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundLoader);
 };
 
 BackgroundShellServiceLoader::BackgroundShellServiceLoader(
     scoped_ptr<ServiceLoader> real_loader,
     const std::string& thread_name,
     base::MessageLoop::Type message_loop_type)
-    : loader_(real_loader.Pass()),
+    : quit_on_shutdown_(false),
+      loader_(real_loader.Pass()),
       message_loop_type_(message_loop_type),
       thread_name_(thread_name),
       message_loop_created_(true, false),
       background_loader_(NULL) {
 }
 
 BackgroundShellServiceLoader::~BackgroundShellServiceLoader() {
-  if (thread_)
+  if (thread_) {
+    if (quit_on_shutdown_)
+      task_runner_->PostTask(FROM_HERE, quit_closure_);
     thread_->Join();
+  }
 }
 
 void BackgroundShellServiceLoader::LoadService(
     ServiceManager* manager,
     const GURL& url,
     ScopedMessagePipeHandle shell_handle) {
   if (!thread_) {
     // TODO(tim): It'd be nice if we could just have each LoadService call
     // result in a new thread like DynamicService{Loader, Runner}. But some
     // loaders are creating multiple ApplicationImpls (NetworkServiceLoader)
@@ skipping 47 matching lines @@
 
 void BackgroundShellServiceLoader::OnServiceErrorOnBackgroundThread(
     ServiceManager* manager, const GURL& url) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   if (!background_loader_)
     background_loader_ = new BackgroundLoader(loader_.get());
   background_loader_->OnServiceError(manager, url);
 }
 
 }  // namespace mojo