Mash: Replaces "exe:chrome" with "service:content_browser"

services/catalog/catalog.cc

 // Copyright 2016 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 "services/catalog/catalog.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
@@ skipping 93 matching lines @@
   PathService::Get(base::DIR_MODULE, &system_package_dir);
   system_package_dir = system_package_dir.AppendASCII(kPackagesDirName);
   system_reader_->Read(system_package_dir, &system_cache_,
                        base::Bind(&Catalog::SystemPackageDirScanned,
                                   weak_factory_.GetWeakPtr()));
 }
 
 bool Catalog::OnConnect(const shell::Identity& remote_identity,
                         shell::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::Catalog>(this);
+  registry->AddInterface<mojom::CatalogControl>(this);
   registry->AddInterface<filesystem::mojom::Directory>(this);
   registry->AddInterface<shell::mojom::Resolver>(this);
   return true;
 }
 
 void Catalog::Create(const shell::Identity& remote_identity,
                      shell::mojom::ResolverRequest request) {
   Instance* instance = GetInstanceForUserId(remote_identity.user_id());
   instance->BindResolver(std::move(request));
 }
@@ skipping 10 matching lines @@
     lock_table_ = new filesystem::LockTable;
   base::FilePath resources_path =
       GetPathForApplicationName(remote_identity.name());
   mojo::MakeStrongBinding(
       base::MakeUnique<filesystem::DirectoryImpl>(
           resources_path, scoped_refptr<filesystem::SharedTempDir>(),
           lock_table_),
       std::move(request));
 }
 
+void Catalog::Create(const shell::Identity& remote_identity,
+                     mojom::CatalogControlRequest request) {
+  control_bindings_.AddBinding(this, std::move(request));
+}
+
+void Catalog::OverrideManifestPath(
+    const std::string& service_name,
+    const base::FilePath& path,
+    const OverrideManifestPathCallback& callback) {
+  system_reader_->OverrideManifestPath(service_name, path);
+  callback.Run();
+}
+
 Instance* Catalog::GetInstanceForUserId(const std::string& user_id) {
   auto it = instances_.find(user_id);
   if (it != instances_.end())
     return it->second.get();
 
   // TODO(beng): There needs to be a way to load the store from different users.
   Instance* instance = new Instance(std::move(store_), system_reader_.get());
   instances_[user_id] = base::WrapUnique(instance);
   if (loaded_)
     instance->CacheReady(&system_cache_);
 
   return instance;
 }
 
 void Catalog::SystemPackageDirScanned() {
   loaded_ = true;
   for (auto& instance : instances_)
     instance.second->CacheReady(&system_cache_);
 }
 
 }  // namespace catalog