Move fetching logic out of ApplicationManager, eliminate url mappings.

mojo/shell/application_manager.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_APPLICATION_MANAGER_H_
 #define MOJO_SHELL_APPLICATION_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
-#include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/services/updater/updater.mojom.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/capability_filter.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/native_runner.h"
 #include "url/gurl.h"
 
 namespace base {
 class FilePath;
 class SequencedWorkerPool;
 }
 
 namespace mojo {
 namespace shell {
 
+class ApplicationFetcher;
 class ApplicationInstance;
 class ContentHandlerConnection;
 
 class ApplicationManager {
  public:
-  class Delegate {
-   public:
-    // Gives the delegate a chance to apply any mappings for the specified url.
-    // This should not resolve 'mojo' urls, that is done by ResolveMojoURL().
-    virtual GURL ResolveMappings(const GURL& url) = 0;
-
-    // Used to map a url with the scheme 'mojo' to the appropriate url. Return
-    // |url| if the scheme is not 'mojo'.
-    virtual GURL ResolveMojoURL(const GURL& url) = 0;
-
-    // Asks the delegate to create a Fetcher for the specified url. Return
-    // true on success, false if the default fetcher should be created.
-    virtual bool CreateFetcher(
-        const GURL& url,
-        const Fetcher::FetchCallback& loader_callback) = 0;
-
-   protected:
-    virtual ~Delegate() {}
-  };
-
   // API for testing.
   class TestAPI {
    public:
     explicit TestAPI(ApplicationManager* manager);
     ~TestAPI();
 
     // Returns true if the shared instance has been created.
     static bool HasCreatedInstance();
     // Returns true if there is a ApplicationInstance for this URL.
     bool HasRunningInstanceForURL(const GURL& url) const;
 
    private:
     ApplicationManager* manager_;
 
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
-  explicit ApplicationManager(Delegate* delegate);
+  explicit ApplicationManager(scoped_ptr<ApplicationFetcher> fetcher);
   ~ApplicationManager();
 
   // Loads a service if necessary and establishes a new client connection.
   // |originator| can be NULL (e.g. for the first application or in tests), but
   // typically is non-NULL and identifies the instance initiating the
   // connection.
   // Please see the comments in connect_to_application_params.h for more details
   // about the parameters.
   void ConnectToApplication(
       ApplicationInstance* originator,
@@ skipping 35 matching lines @@
   void set_default_loader(scoped_ptr<ApplicationLoader> loader) {
     default_loader_ = loader.Pass();
   }
   void set_native_runner_factory(
       scoped_ptr<NativeRunnerFactory> runner_factory) {
     native_runner_factory_ = runner_factory.Pass();
   }
   void set_blocking_pool(base::SequencedWorkerPool* blocking_pool) {
     blocking_pool_ = blocking_pool;
   }
-  void set_disable_cache(bool disable_cache) { disable_cache_ = disable_cache; }
   // Sets a Loader to be used for a specific url.
   void SetLoaderForURL(scoped_ptr<ApplicationLoader> loader, const GURL& url);
   // Sets a Loader to be used for a specific url scheme.
   void SetLoaderForScheme(scoped_ptr<ApplicationLoader> loader,
                           const std::string& scheme);
   // These options will be used in running any native application at |url|
   // (which shouldn't contain a query string). (|url| will be mapped and
   // resolved, and any application whose base resolved URL matches it will have
   // |options| applied.)
   // TODO(vtl): This may not do what's desired if the resolved URL results in an
@@ skipping 27 matching lines @@
   using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
   using URLToNativeOptionsMap = std::map<GURL, NativeRunnerFactory::Options>;
 
   // Takes the contents of |params| only when it returns true.
   bool ConnectToRunningApplication(
       scoped_ptr<ConnectToApplicationParams>* params);
   // |resolved_url| is the URL to load by |loader| (if loader is not null). It
   // may be different from |(*params)->app_url()| because of mappings and
   // resolution rules.
   // Takes the contents of |params| only when it returns true.
-  bool ConnectToApplicationWithLoader(
+  void ConnectToApplicationWithLoader(
       scoped_ptr<ConnectToApplicationParams>* params,
       const GURL& resolved_url,
       ApplicationLoader* loader);
 
   InterfaceRequest<Application> RegisterInstance(
       scoped_ptr<ConnectToApplicationParams> params,
       ApplicationInstance** resulting_instance);
 
   // Called once |fetcher| has found app. |params->app_url()| is the url of
   // the requested application before any mappings/resolution have been applied.
   // The corresponding URLRequest struct in |params| has been taken.
   void HandleFetchCallback(scoped_ptr<ConnectToApplicationParams> params,
-                           NativeApplicationCleanup cleanup,
                            scoped_ptr<Fetcher> fetcher);
 
   void RunNativeApplication(InterfaceRequest<Application> application_request,
                             bool start_sandboxed,
                             const NativeRunnerFactory::Options& options,
-                            NativeApplicationCleanup cleanup,
                             scoped_ptr<Fetcher> fetcher,
                             const base::FilePath& file_path,
                             bool path_exists);
 
   void LoadWithContentHandler(
       const Identity& originator_identity,
       const CapabilityFilter& originator_filter,
       const GURL& content_handler_url,
       const std::string& qualifier,
       const CapabilityFilter& filter,
       const Shell::ConnectToApplicationCallback& connect_callback,
       ApplicationInstance* app,
       InterfaceRequest<Application> application_request,
       URLResponsePtr url_response);
 
-  // Returns the appropriate loader for |url|, or null if there is no loader
-  // configured for the URL.
+  // Returns the appropriate loader for |url|, or the default loader if there is
+  // no loader configured for the URL.
   ApplicationLoader* GetLoaderForURL(const GURL& url);
 
   void CleanupRunner(NativeRunner* runner);
 
   ScopedMessagePipeHandle ConnectToServiceByName(
       const GURL& application_url,
       const std::string& interface_name);
 
-  Delegate* const delegate_;
+  scoped_ptr<ApplicationFetcher> const fetcher_;
   // Loader management.
   // Loaders are chosen in the order they are listed here.
   URLToLoaderMap url_to_loader_;
   SchemeToLoaderMap scheme_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
 
   ApplicationPackagedAlias application_package_alias_;
   IdentityToApplicationInstanceMap identity_to_instance_;
   URLToContentHandlerMap url_to_content_handler_;
   // Note: The keys are URLs after mapping and resolving.
   URLToNativeOptionsMap url_to_native_options_;
 
   base::SequencedWorkerPool* blocking_pool_;
-  NetworkServicePtr network_service_;
-  URLLoaderFactoryPtr url_loader_factory_;
   updater::UpdaterPtr updater_;
   MimeTypeToURLMap mime_type_to_url_;
   ScopedVector<NativeRunner> native_runners_;
-  bool disable_cache_;
   // Counter used to assign ids to content_handlers.
   uint32_t content_handler_id_counter_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 Shell::ConnectToApplicationCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_APPLICATION_MANAGER_H_