Get rid of KeepAlive. Quit shell when all urls run directly by Context are closed.

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 <vector>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 78 matching lines @@
     GURL url(parts[i + 1]);
     if (!url.is_valid()) {
       LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                  << ": '" << parts[i + 1] << "' is not a valid URL.";
       return;
     }
     loader->RegisterContentHandler(parts[i], url);
   }
 }
 
+class EmptyServiceProvider : public InterfaceImpl<ServiceProvider> {
+ private:
+  virtual void ConnectToService(const mojo::String& service_name,
+                                ScopedMessagePipeHandle client_handle)
+      MOJO_OVERRIDE {
+  }
+};
+
 }  // namespace
 
 class Context::NativeViewportApplicationLoader
     : public ApplicationLoader,
       public ApplicationDelegate,
       public InterfaceFactory<NativeViewport>,
       public InterfaceFactory<Gpu> {
  public:
   NativeViewportApplicationLoader()
       : share_group_(new gfx::GLShareGroup),
@@ skipping 37 matching lines @@
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);
 };
 
 Context::Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
+Context::~Context() {
+  DCHECK(!base::MessageLoop::current());
+}
+
 void Context::Init() {
+  application_manager_.set_delegate(this);
   setup.Get();
   task_runners_.reset(
       new TaskRunners(base::MessageLoop::current()->message_loop_proxy()));
 
   for (size_t i = 0; i < arraysize(kLocalMojoURLs); ++i)
     mojo_url_resolver_.AddLocalFileMapping(GURL(kLocalMojoURLs[i]));
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   scoped_ptr<DynamicServiceRunnerFactory> runner_factory;
   if (command_line->HasSwitch(switches::kEnableMultiprocess))
@@ skipping 55 matching lines @@
         new BackgroundShellApplicationLoader(
             scoped_ptr<ApplicationLoader>(new NetworkApplicationLoader()),
             "network_service",
             base::MessageLoop::TYPE_IO));
     application_manager_.SetLoaderForURL(loader.PassAs<ApplicationLoader>(),
                                          GURL("mojo:mojo_network_service"));
   }
 #endif
 }
 
-Context::~Context() {
-  DCHECK(!base::MessageLoop::current());
+void Context::OnServiceError(const GURL& gurl) {
+  if (app_urls_.find(gurl) != app_urls_.end()) {
+    app_urls_.erase(gurl);
+    if (app_urls_.empty() && base::MessageLoop::current()->is_running())
+      base::MessageLoop::current()->Quit();
+  }
+}
+
+void Context::Run(const GURL& url) {
+  EmptyServiceProvider* sp = new EmptyServiceProvider;
+  ServiceProviderPtr spp;
+  BindToProxy(sp, &spp);
+
+  app_urls_.insert(url);
+  application_manager_.ConnectToApplication(url, GURL(), spp.Pass());
+}
+
+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