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

mojo/shell/dbus_application_loader_linux.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/shell/dbus_application_loader_linux.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "dbus/bus.h"
 #include "dbus/file_descriptor.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "mojo/dbus/dbus_external_service.h"
 #include "mojo/embedder/channel_init.h"
 #include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/external_service.mojom.h"
-#include "mojo/shell/keep_alive.h"
 
 namespace mojo {
 namespace shell {
 
 // Manages the connection to a single externally-running service.
 class DBusApplicationLoader::LoadContext {
  public:
   // Kicks off the attempt to bootstrap a connection to the externally-running
   // service specified by url_.
   // Creates a MessagePipe and passes one end over DBus to the service. Then,
   // calls ExternalService::Activate(ShellHandle) over the now-shared pipe.
   LoadContext(DBusApplicationLoader* loader,
               const scoped_refptr<dbus::Bus>& bus,
               const GURL& url,
               ScopedMessagePipeHandle service_provider_handle)
       : loader_(loader),
         bus_(bus),
         service_dbus_proxy_(NULL),
         url_(url),
-        service_provider_handle_(service_provider_handle.Pass()),
-        keep_alive_(loader->context_) {
+        service_provider_handle_(service_provider_handle.Pass()) {
     base::PostTaskAndReplyWithResult(
         loader_->context_->task_runners()->io_runner(),
         FROM_HERE,
         base::Bind(&LoadContext::CreateChannelOnIOThread,
                    base::Unretained(this)),
         base::Bind(&LoadContext::ConnectChannel, base::Unretained(this)));
   }
 
   virtual ~LoadContext() {}
 
@@ skipping 68 matching lines @@
                      base::Unretained(loader_),
                      url_));
     }
   }
 
   DBusApplicationLoader* const loader_;
   scoped_refptr<dbus::Bus> bus_;
   dbus::ObjectProxy* service_dbus_proxy_;  // Owned by bus_;
   const GURL url_;
   ScopedMessagePipeHandle service_provider_handle_;
-  KeepAlive keep_alive_;
   scoped_ptr<embedder::ChannelInit> channel_init_;
   ExternalServicePtr external_service_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadContext);
 };
 
 DBusApplicationLoader::DBusApplicationLoader(Context* context)
     : context_(context) {
   dbus::Bus::Options options;
   options.bus_type = dbus::Bus::SESSION;
@@ skipping 33 matching lines @@
   DCHECK(it != url_to_load_context_.end()) << url;
 
   LoadContext* doomed = it->second;
   url_to_load_context_.erase(it);
 
   delete doomed;
 }
 
 }  // namespace shell
 }  // namespace mojo