Mojo: Fix two bugs in content handling

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 "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 
 class Context;
 class DynamicServiceRunnerFactory;
 class DynamicServiceRunner;
+class Loader;
+
+namespace internal {
+
+// Please do not use, this is an implementation detail.

[darin (slow to review), 2014/08/27 06:34:19]

it would be possible to hide this by moving most of the state of
DynamicApplicationLoader into an inner class, but that's probably not worth the
effort.

+class LoaderDelegate {
+ public:
+  virtual void LoaderComplete(Loader* loader) = 0;
+  virtual scoped_ptr<DynamicServiceRunner> CreateRunner() = 0;
+  virtual void CreateURLLoader(InterfaceRequest<URLLoader> loader_request) = 0;
+  virtual const GURL& GetContentHandlerURL(const std::string& mime_type) = 0;
+  virtual base::SequencedWorkerPool* GetBlockingPool() = 0;
+  virtual ~LoaderDelegate() {

[darin (slow to review), 2014/08/27 06:34:19]

nit: list dtor first as that's pretty canonical.

[Aaron Boodman, 2014/08/27 18:26:13]

irrelevant in latest patch.

+  }
+};
+
+}  // namespace internal
 
 // 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 {
+class DynamicApplicationLoader : public ApplicationLoader,
+                                 public internal::LoaderDelegate {
  public:
   DynamicApplicationLoader(
       Context* context,
       scoped_ptr<DynamicServiceRunnerFactory> runner_factory);
   virtual ~DynamicApplicationLoader();
 
   void RegisterContentHandler(const std::string& mime_type,
                               const GURL& content_handler_url);
 
   // ApplicationLoader methods:
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
   virtual void OnApplicationError(ApplicationManager* manager,
                                   const GURL& url) OVERRIDE;
 
  private:
   typedef std::map<std::string, GURL> MimeTypeToURLMap;
 
-  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 OnRunLibraryComplete(DynamicServiceRunner* runner,
-                            const base::FilePath& temp_file);
+  // LoaderDelegate methods:
+  virtual void LoaderComplete(Loader* loader) OVERRIDE;
+  virtual scoped_ptr<DynamicServiceRunner> CreateRunner() OVERRIDE;
+  virtual void CreateURLLoader(
+      InterfaceRequest<URLLoader> loader_request) OVERRIDE;
+  virtual const GURL& GetContentHandlerURL(
+      const std::string& mime_type) OVERRIDE;
+  virtual base::SequencedWorkerPool* GetBlockingPool() OVERRIDE;
 
   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_;
+  ScopedVector<Loader> loaders_;
 
   DISALLOW_COPY_AND_ASSIGN(DynamicApplicationLoader);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_DYNAMIC_APPLICATION_LOADER_H_