Rename PackageManager->Catalog.

mojo/shell/background/tests/test_catalog_store.h

Index: mojo/shell/background/tests/test_catalog_store.h
diff --git a/mojo/shell/background/tests/test_application_catalog_store.h b/mojo/shell/background/tests/test_catalog_store.h
similarity index 64%
rename from mojo/shell/background/tests/test_application_catalog_store.h
rename to mojo/shell/background/tests/test_catalog_store.h
index 5b2cf960115209a733154d2792e3cb972f777f03..97937982bd3b2240c8118b7055d8dc04f778c817 100644
--- a/mojo/shell/background/tests/test_application_catalog_store.h
+++ b/mojo/shell/background/tests/test_catalog_store.h
@@ -2,25 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SHELL_BACKGROUND_TESTS_TEST_APPLICATION_CATALOG_STORE_H_
-#define MOJO_SHELL_BACKGROUND_TESTS_TEST_APPLICATION_CATALOG_STORE_H_
+#ifndef MOJO_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
+#define MOJO_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "mojo/services/package_manager/package_manager.h"
+#include "mojo/services/catalog/catalog.h"
 
 namespace mojo {
 namespace shell {
 
 // ApplicationCatalogStore implementation that takes the ListValue to return
 // as store.
-class TestApplicationCatalogStore
-    : public package_manager::ApplicationCatalogStore {
+class TestCatalogStore : public catalog::Store {
  public:
-  explicit TestApplicationCatalogStore(scoped_ptr<base::ListValue> store);
-  ~TestApplicationCatalogStore() override;
+  explicit TestCatalogStore(scoped_ptr<base::ListValue> store);
+  ~TestCatalogStore() override;
 
   bool get_store_called() const { return get_store_called_; }
 
@@ -32,7 +31,7 @@ class TestApplicationCatalogStore
   bool get_store_called_ = false;
   scoped_ptr<base::ListValue> store_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestApplicationCatalogStore);
+  DISALLOW_COPY_AND_ASSIGN(TestCatalogStore);
 };
 
 // Returns a dictionary for an app with the specified name, display name and a
@@ -44,4 +43,4 @@ scoped_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo(
 }  // namespace shell
 }  // namespace mojo
 
-#endif  // MOJO_SHELL_BACKGROUND_TESTS_TEST_APPLICATION_CATALOG_STORE_H_
+#endif  // MOJO_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_