Rename PackageManager->Catalog.

mojo/services/catalog/loader.h

Index: mojo/services/catalog/loader.h
diff --git a/mojo/services/package_manager/loader.h b/mojo/services/catalog/loader.h
similarity index 61%
rename from mojo/services/package_manager/loader.h
rename to mojo/services/catalog/loader.h
index f9633047e10068f22cf42264f9d9cb790cda0e85..48986e17c43f2dd2a4cce94a0c737b5999426e39 100644
--- a/mojo/services/package_manager/loader.h
+++ b/mojo/services/catalog/loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PACKAGE_MANAGER_LOADER_H_
-#define MOJO_SERVICES_PACKAGE_MANAGER_LOADER_H_
+#ifndef MOJO_SERVICES_CATALOG_LOADER_H_
+#define MOJO_SERVICES_CATALOG_LOADER_H_
 
 #include "mojo/shell/loader.h"
 
@@ -16,14 +16,13 @@ class ShellClient;
 class ShellConnection;
 }
 
-namespace package_manager {
+namespace catalog {
 
-class ApplicationCatalogStore;
+class Store;
 
 class Loader : public mojo::shell::Loader {
  public:
-  Loader(base::TaskRunner* blocking_pool,
-         scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog);
+  Loader(base::TaskRunner* blocking_pool, scoped_ptr<Store> store);
   ~Loader() override;
 
   // mojo::shell::Loader:
@@ -32,13 +31,13 @@ class Loader : public mojo::shell::Loader {
 
  private:
   base::TaskRunner* blocking_pool_;
-  scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog_;
+  scoped_ptr<Store> store_;
   scoped_ptr<mojo::ShellClient> client_;
   scoped_ptr<mojo::ShellConnection> connection_;
 
   DISALLOW_COPY_AND_ASSIGN(Loader);
 };
 
-}  // namespace package_manager
+}  // namespace catalog
 
-#endif  // MOJO_SERVICES_PACKAGE_MANAGER_LOADER_H_
+#endif  // MOJO_SERVICES_CATALOG_LOADER_H_