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

services/catalog/catalog.cc

Index: services/catalog/catalog.cc
diff --git a/services/catalog/catalog.cc b/services/catalog/catalog.cc
index 4545267c5ca6092c94929df129ae0cd3acbf8bfa..e47caa7a2143802610f3bd678a7fa6605eaed130 100644
--- a/services/catalog/catalog.cc
+++ b/services/catalog/catalog.cc
@@ -111,6 +111,7 @@ void Catalog::ScanSystemPackageDir() {
 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;
@@ -141,6 +142,19 @@ void Catalog::Create(const shell::Identity& remote_identity,
       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())