Fix mojo::shell::Context shutdown.

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/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
+#include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "mojo/common/trace_controller_impl.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 20 matching lines @@
     embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
         new mojo::embedder::SimplePlatformSupport()));
   }
 
   ~Setup() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
-static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
-
 void InitContentHandlers(NativeApplicationLoader* loader,
                          base::CommandLine* command_line) {
   // Default content handlers.
   loader->RegisterContentHandler("application/pdf", GURL("mojo:pdf_viewer"));
   loader->RegisterContentHandler("image/png", GURL("mojo:png_viewer"));
   loader->RegisterContentHandler("text/html", GURL("mojo:html_viewer"));
 
   // Command-line-specified content handlers.
   std::string handlers_spec =
       command_line->GetSwitchValueASCII(switches::kContentHandlers);
@@ skipping 117 matching lines @@
 
   base::FilePath cwd;
   PathService::Get(base::DIR_CURRENT, &cwd);
   SetCommandLineCWD(cwd);
 }
 
 Context::~Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
+// static
 void Context::EnsureEmbedderIsInitialized() {
+  static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
   setup.Get();
 }
 
 void Context::SetShellFileRoot(const base::FilePath& path) {
   shell_file_root_ = AddTrailingSlashIfNeeded(FilePathToFileURL(path));
 }
 
 GURL Context::ResolveShellFileURL(const std::string& path) {
   return shell_file_root_.Resolve(path);
 }
@@ skipping 61 matching lines @@
       GURL("mojo:tracing"), GURL(""), nullptr,
       tracing_service_provider_ptr.Pass());
 
   if (listener_)
     listener_->WaitForListening();
 
   return true;
 }
 
 void Context::Shutdown() {
+  DCHECK_EQ(base::MessageLoop::current()->task_runner(),
+            task_runners_->shell_runner());
   embedder::ShutdownIPCSupport();
+  // We'll quit when we get OnShutdownComplete().
+  base::MessageLoop::current()->Run();
 }
 
 void Context::OnApplicationError(const GURL& url) {
   if (app_urls_.find(url) != app_urls_.end()) {
     app_urls_.erase(url);
-    if (app_urls_.empty() && base::MessageLoop::current()->is_running())
-      Shutdown();
+    if (app_urls_.empty() && base::MessageLoop::current()->is_running()) {
+      DCHECK_EQ(base::MessageLoop::current()->task_runner(),
+                task_runners_->shell_runner());
+      base::MessageLoop::current()->Quit();
+    }
   }
 }
 
 GURL Context::ResolveURL(const GURL& url) {
   return url_resolver_.ResolveMojoURL(url);
 }
 
 GURL Context::ResolveMappings(const GURL& url) {
   return url_resolver_.ApplyMappings(url);
 }
@@ skipping 16 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