Rename PackageManager->Catalog.

mojo/shell/shell.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_SHELL_H_
 #define MOJO_SHELL_SHELL_H_
 
 #include <map>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "mojo/services/package_manager/package_manager.h"
+#include "mojo/services/catalog/catalog.h"
 #include "mojo/shell/connect_params.h"
 #include "mojo/shell/loader.h"
 #include "mojo/shell/native_runner.h"
 #include "mojo/shell/public/cpp/identity.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/interfaces/connector.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"
@@ skipping 45 matching lines @@
   };
 
   // |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().
   // |file_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 Loader implementations.
   Shell(scoped_ptr<NativeRunnerFactory> native_runner_factory,
         base::TaskRunner* file_task_runner,
-        scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog);
+        scoped_ptr<catalog::Store> catalog_store);
   ~Shell() override;
 
   // Provide a callback to be notified whenever an instance is destroyed.
   // Typically the creator of the Shell will use this to determine when some set
   // of instances it created are destroyed, so it can shut down.
   void SetInstanceQuitCallback(base::Callback<void(const Identity&)> callback);
 
   // Completes a connection between a source and target application as defined
   // by |params|, exchanging InterfaceProviders between them. If no existing
   // instance of the target application is running, one will be loaded.
@@ skipping 17 matching lines @@
   class Instance;
 
   using IdentityToInstanceMap = std::map<Identity, Instance*>;
   using NameToLoaderMap = std::map<std::string, Loader*>;
   using IdentityToShellClientFactoryMap =
       std::map<Identity, mojom::ShellClientFactoryPtr>;
 
   // ShellClient:
   bool AcceptConnection(Connection* connection) override;
 
-  void InitPackageManager(
-      scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog);
+  void InitCatalog(scoped_ptr<catalog::Store> store);
 
   // Destroys all Shell-ends of connections established with Applications.
   // Applications connected by this Shell will observe pipe errors and have a
   // chance to shutdown.
   void TerminateShellConnections();
 
   // Removes a Instance when it encounters an error.
   void OnInstanceError(Instance* instance);
 
   // Returns a running instance matching |identity|.
@@ skipping 28 matching lines @@
                          const Identity& shell_client_factory,
                          const std::string& name,
                          mojom::ShellClientRequest request);
   // Returns a running ShellClientFactory for |shell_client_factory_identity|,
   // if there is not one running one is started for |source_identity|.
   mojom::ShellClientFactory* GetShellClientFactory(
       const Identity& shell_client_factory_identity,
       const Identity& source_identity);
   void OnShellClientFactoryLost(const Identity& which);;
 
-  // Callback when remote PackageManager resolves mojo:foo to mojo:bar.
+  // Callback when remote Catalog resolves mojo:foo to mojo:bar.
   // |params| are the params passed to Connect().
   // |resolved_name| is the mojo: name identifying the physical package
   // application.
   // |file_url| is the resolved file:// URL of the physical package.
   // |base_filter| is the CapabilityFilter the requested application should be
   // run with, from its manifest.
   void OnGotResolvedName(scoped_ptr<ConnectParams> params,
                          const String& resolved_name,
                          const String& resolved_instance,
                          mojom::CapabilityFilterPtr base_filter,
@@ skipping 37 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 mojom::Connector::ConnectCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_SHELL_H_