Rename PackageManager->Catalog.

mojo/shell/shell.cc

 // 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.
 
 #include "mojo/shell/shell.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/process/process.h"
 #include "base/process/process_handle.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/package_manager/loader.h"
+#include "mojo/services/catalog/loader.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/public/cpp/connect.h"
 #include "mojo/shell/public/cpp/names.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/public/interfaces/connector.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
 #include "mojo/util/filename_util.h"
 
 namespace mojo {
 namespace shell {
 namespace {
-const char kPackageManagerName[] = "mojo:package_manager";
+const char kCatalogName[] = "mojo:catalog";
 
 void EmptyResolverCallback(const String& resolved_name,
                            const String& resolved_instance,
                            mojom::CapabilityFilterPtr base_filter,
                            const String& file_url) {}
 
 }
 
 Identity CreateShellIdentity() {
   return Identity("mojo:shell", mojom::kRootUserID);
@@ skipping 270 matching lines @@
       return true;
   }
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::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)
     : file_task_runner_(file_task_runner),
       native_runner_factory_(std::move(native_runner_factory)),
       weak_ptr_factory_(this) {
   mojom::ShellClientRequest request;
   CreateInstance(CreateShellIdentity(), GetPermissiveCapabilityFilter(),
                  &request);
   shell_connection_.reset(new ShellConnection(this, std::move(request)));
 
-  InitPackageManager(std::move(app_catalog));
+  InitCatalog(std::move(catalog_store));
 }
 
 Shell::~Shell() {
   TerminateShellConnections();
   STLDeleteValues(&name_to_loader_);
   for (auto& runner : native_runners_)
     runner.reset();
 }
 
 void Shell::SetInstanceQuitCallback(
@@ skipping 67 matching lines @@
       break;
     }
   }
   DCHECK(instance);
   return instance->AcceptConnection(connection);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
-void Shell::InitPackageManager(
-    scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog) {
+void Shell::InitCatalog(scoped_ptr<catalog::Store> store) {
   scoped_ptr<Loader> loader(
-      new package_manager::Loader(file_task_runner_, std::move(app_catalog)));
+      new catalog::Loader(file_task_runner_, std::move(store)));
   Loader* loader_raw = loader.get();
-  std::string name = kPackageManagerName;
+  std::string name = kCatalogName;
   SetLoaderForName(std::move(loader), name);
 
   mojom::ShellClientRequest request;
-  // TODO(beng): Does the package manager actually have to be run with a
-  //             permissive filter?
+  // TODO(beng): Does the catalog actually have to be run with a permissive
+  //             filter?
   Identity identity(name, mojom::kRootUserID);
   CreateInstance(identity, GetPermissiveCapabilityFilter(), &request);
   loader_raw->Load(name, std::move(request));
 
   ConnectToInterface(this, CreateShellIdentity(), name, &shell_resolver_);
 
-  // Seed the catalog with manifest info for the shell & package manager.
+  // Seed the catalog with manifest info for the shell & catalog.
   if (file_task_runner_) {
     shell_resolver_->ResolveMojoName(name, base::Bind(&EmptyResolverCallback));
     shell_resolver_->ResolveMojoName("mojo:shell",
                                      base::Bind(&EmptyResolverCallback));
   }
 }
 
 void Shell::TerminateShellConnections() {
   STLDeleteValues(&identity_to_instance_);
 }
@@ skipping 186 matching lines @@
   for (auto it = native_runners_.begin(); it != native_runners_.end(); ++it) {
     if (it->get() == runner) {
       native_runners_.erase(it);
       return;
     }
   }
 }
 
 }  // namespace shell
 }  // namespace mojo