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

mojo/shell/dynamic_application_loader.h

 // 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.
 
 #ifndef MOJO_SHELL_DYNAMIC_APPLICATION_LOADER_H_
 #define MOJO_SHELL_DYNAMIC_APPLICATION_LOADER_H_
 
 #include <map>
 
 #include "base/macros.h"
+#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/public/interfaces/network/network_service.mojom.h"
 #include "mojo/shell/dynamic_service_runner.h"
-#include "mojo/shell/keep_alive.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 
 class Context;
 class DynamicServiceRunnerFactory;
+class DynamicServiceRunner;
 
 // An implementation of ApplicationLoader that retrieves a dynamic library
 // containing the implementation of the service and loads/runs it (via a
 // DynamicServiceRunner).
 class DynamicApplicationLoader : public ApplicationLoader {
  public:
   DynamicApplicationLoader(
       Context* context,
       scoped_ptr<DynamicServiceRunnerFactory> runner_factory);
   virtual ~DynamicApplicationLoader();
@@ skipping 14 matching lines @@
   void LoadLocalService(const GURL& resolved_url,
                         scoped_refptr<LoadCallbacks> callbacks);
   void LoadNetworkService(const GURL& resolved_url,
                           scoped_refptr<LoadCallbacks> callbacks);
   void OnLoadNetworkServiceComplete(scoped_refptr<LoadCallbacks> callbacks,
                                     URLResponsePtr url_response);
   void RunLibrary(const base::FilePath& response_file,
                   scoped_refptr<LoadCallbacks> callbacks,
                   bool delete_file_after,
                   bool response_path_exists);
+  void RunLibraryComplete(DynamicServiceRunner* runner,

[tim (not reviewing), 2014/08/23 00:14:27]

nit: OnRunLibraryComplete

[DaveMoore, 2014/08/24 22:31:11]

Done.

+                          const base::FilePath& temp_file);
 
   Context* const context_;
   scoped_ptr<DynamicServiceRunnerFactory> runner_factory_;
+  ScopedVector<DynamicServiceRunner> runners_;
   NetworkServicePtr network_service_;
   URLLoaderPtr url_loader_;
   MimeTypeToURLMap mime_type_to_url_;
   base::WeakPtrFactory<DynamicApplicationLoader> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DynamicApplicationLoader);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_DYNAMIC_APPLICATION_LOADER_H_