Remove the old package manager

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 <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/public/cpp/bindings/interface_ptr_info.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/weak_interface_ptr_set.h"
 #include "mojo/services/package_manager/public/interfaces/shell_resolver.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 "mojo/shell/public/interfaces/application_manager.mojom.h"
 #include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
 #include "url/gurl.h"
 
 namespace base {
 class FilePath;
 class SequencedWorkerPool;
 }
 
 namespace mojo {
 namespace shell {
 
-class PackageManager;
 class ApplicationInstance;
 class ContentHandlerConnection;
 
 class ApplicationManager {
  public:
   // 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);
   };
 
   // Creates an ApplicationManager.
-  // |package_manager| is an instance of an object that handles URL resolution,
-  // fetching and updating of applications. See package_manager.h.
-  ApplicationManager(scoped_ptr<PackageManager> package_manager,
-                     bool register_mojo_url_schemes);
+  explicit ApplicationManager(bool register_mojo_url_schemes);
   // |native_runner_factory| is an instance of an object capable of vending
   // implementations of NativeRunner, e.g. for in or out-of-process execution.
   // See native_runner.h and RunNativeApplication().
   // |task_runner| provides access to a thread to perform file copy operations
   // on. This may be null only in testing environments where applications are
   // loaded via ApplicationLoader implementations.
   // When |register_mojo_url_schemes| is true, mojo: and exe: URL schems are
   // registered as "standard" which faciliates resolving.
-  ApplicationManager(scoped_ptr<PackageManager> package_manager,
-                     scoped_ptr<NativeRunnerFactory> native_runner_factory,
+  ApplicationManager(scoped_ptr<NativeRunnerFactory> native_runner_factory,
                      base::TaskRunner* task_runner,
                      bool register_mojo_url_schemes);
   ~ApplicationManager();
 
   // Loads a service if necessary and establishes a new client connection.
   // Please see the comments in connect_to_application_params.h for more details
   // about the parameters.
   void ConnectToApplication(scoped_ptr<ConnectToApplicationParams> params);
 
   // Sets the default Loader to be used if not overridden by SetLoaderForURL().
@@ skipping 19 matching lines @@
       const GURL& url,
       mojom::CapabilityFilterPtr filter,
       InterfaceRequest<mojom::PIDReceiver> pid_receiver);
   void AddListener(mojom::ApplicationManagerListenerPtr listener);
 
   void ApplicationPIDAvailable(uint32_t id, base::ProcessId pid);
 
  private:
   using IdentityToInstanceMap = std::map<Identity, ApplicationInstance*>;
   using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
-
-  void UseRemotePackageManager(bool register_mojo_url_schemes);
+  using IdentityToContentHandlerMap =
+      std::map<Identity, ContentHandlerConnection*>;
 
   // Takes the contents of |params| only when it returns true.
   bool ConnectToRunningApplication(
       scoped_ptr<ConnectToApplicationParams>* params);
 
   ApplicationInstance* CreateAndConnectToInstance(
       scoped_ptr<ConnectToApplicationParams> params,
       Identity* source,
       Identity* target,
       const std::string& application_name,
       mojom::ShellClientRequest* request);
   ApplicationInstance* CreateInstance(
       const Identity& target_id,
       const mojom::Shell::ConnectToApplicationCallback& connect_callback,
       const base::Closure& on_application_end,
       const String& application_name,
       mojom::ShellClientRequest* request);
 
+  uint32_t StartContentHandler(const Identity& source,
+                               const Identity& content_handler,
+                               const GURL& url,
+                               mojom::ShellClientRequest request);
+  // Returns a running ContentHandler for |content_handler_identity|, if there
+  // is not one running one is started for |source_identity|.
+  ContentHandlerConnection* GetContentHandler(
+      const Identity& content_handler_identity,
+      const Identity& source_identity);
+  void OnContentHandlerConnectionClosed(
+      ContentHandlerConnection* content_handler);
+
   // Callback when remote PackageManager resolves mojo:foo to mojo:bar.
   // |params| are the params passed to Connect().
   // |resolved_url| is the mojo: url identifying the physical package
   // application.
   // |file_url| is the resolved file:// URL of the physical package.
   // |application_name| is the requested application's pretty name, from its
   // manifest.
   // |base_filter| is the CapabilityFilter the requested application should be
   // run with, from its manifest.
   void OnGotResolvedURL(scoped_ptr<ConnectToApplicationParams> params,
                         const String& resolved_url,
                         const String& file_url,
                         const String& application_name,
                         mojom::CapabilityFilterPtr base_filter);
 
   // In response to a request via Connect() with |params|, creates an
   // ApplicationInstance and runs the application at |file_url|.
   void CreateAndRunLocalApplication(
       scoped_ptr<ConnectToApplicationParams> params,
       const String& application_name,
       const GURL& file_url);
 
-  void AddListenerManifestsReady(mojom::ApplicationManagerListenerPtr listener);
-
-  // 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,
-                           scoped_ptr<Fetcher> fetcher);
-
   void RunNativeApplication(InterfaceRequest<mojom::ShellClient> request,
                             bool start_sandboxed,
-                            scoped_ptr<Fetcher> fetcher,
                             ApplicationInstance* instance,
-                            const base::FilePath& file_path,
-                            bool path_exists);
+                            const base::FilePath& file_path);
 
   // 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);
 
   mojom::ApplicationInfoPtr CreateApplicationInfoForInstance(
       ApplicationInstance* instance) const;
 
-  bool use_remote_package_manager_;
   package_manager::mojom::ShellResolverPtr shell_resolver_;
 
-  scoped_ptr<PackageManager> const package_manager_;
   // Loader management.
   // Loaders are chosen in the order they are listed here.
   URLToLoaderMap url_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
 
   IdentityToInstanceMap identity_to_instance_;
 
+  IdentityToContentHandlerMap identity_to_content_handler_;
+  // Counter used to assign ids to content handlers.
+  uint32_t content_handler_id_counter_;
+
   WeakInterfacePtrSet<mojom::ApplicationManagerListener> listeners_;
 
   base::TaskRunner* task_runner_;
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
   std::vector<scoped_ptr<NativeRunner>> native_runners_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 mojom::Shell::ConnectToApplicationCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_APPLICATION_MANAGER_H_