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

services/shell/service_manager.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 "services/shell/service_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 346 matching lines @@
                             const ConnectCallback& callback) {
     // TODO(beng): Need to do the following additional policy validation of
     // whether this instance is allowed to connect using:
     // - a non-null client_process_connection.
     if (target.user_id() != identity_.user_id() &&
         target.user_id() != mojom::kRootUserID &&
         !HasClass(capability_spec_, kCapabilityClass_UserID)) {
       LOG(ERROR) << "Instance: " << identity_.name() << " running as: "
                   << identity_.user_id() << " attempting to connect to: "
                   << target.name() << " as: " << target.user_id() << " without "
-                  << " the mojo:shell{user_id} capability class.";
+                  << " the service:shell{user_id} capability class.";
       callback.Run(mojom::ConnectResult::ACCESS_DENIED,
                    mojom::kInheritUserID);
       return false;
     }
     if (!target.instance().empty() &&
         target.instance() != GetNamePath(target.name()) &&
         !HasClass(capability_spec_, kCapabilityClass_InstanceName)) {
       LOG(ERROR) << "Instance: " << identity_.name() << " attempting to "
                   << "connect to " << target.name() << " using Instance name: "
                   << target.instance() << " without the "
@@ skipping 102 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceManager, public:
 
 ServiceManager::ServiceManager(
     std::unique_ptr<NativeRunnerFactory> native_runner_factory,
     mojom::ServicePtr catalog)
     : native_runner_factory_(std::move(native_runner_factory)),
       weak_ptr_factory_(this) {
   mojom::ServicePtr service;
   mojom::ServiceRequest request = mojo::GetProxy(&service);
+
+  CapabilitySpec capabilities = GetPermissiveCapabilities();
+  capabilities.provided["control"].insert(
+      "shell::mojom::ServiceManagerControl");
+
   service_manager_instance_ = CreateInstance(
-      Identity(), CreateServiceManagerIdentity(), GetPermissiveCapabilities());
+      Identity(), CreateServiceManagerIdentity(), capabilities);
   service_manager_instance_->StartWithService(std::move(service));
   singletons_.insert(kServiceManagerName);
   service_context_.reset(new ServiceContext(this, std::move(request)));
 
   if (catalog)
     InitCatalog(std::move(catalog));
 }
 
 ServiceManager::~ServiceManager() {
   // Ensure we tear down the ServiceManager instance last. This is to avoid
@@ skipping 29 matching lines @@
   Connect(std::move(params), std::move(service), nullptr);
 
   return request;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceManager, Service implementation:
 
 bool ServiceManager::OnConnect(const Identity& remote_identity,
                                InterfaceRegistry* registry) {
-  // The only interface we expose is mojom::ServiceManager, and access to this
-  // interface is brokered by a policy specific to each caller, managed by the
-  // caller's instance. Here we look to see who's calling, and forward to the
-  // caller's instance to continue.
+  registry->AddInterface<mojom::ServiceManagerControl>(this);
+
+  // Access to mojom::ServiceManager is brokered by a policy specific to each
+  // caller, managed by the caller's instance. Here we look to see who's
+  // calling, and forward to the caller's instance to continue.
   Instance* instance = nullptr;
   for (const auto& entry : identity_to_instance_) {
     if (entry.first == remote_identity) {
       instance = entry.second;
       break;
     }
   }
   DCHECK(instance);
   return instance->OnConnect(remote_identity, registry);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// ServiceManager, InterfaceFactory<mojom::ServiceManagerControl> implementation
+
+void ServiceManager::Create(const Identity& remote_identity,
+                            mojom::ServiceManagerControlRequest request) {
+  control_bindings_.AddBinding(this, std::move(request));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// ServiceManager, ServiceManagerControl implementation
+
+void ServiceManager::OverridePackagePath(
+    const std::string& service_name,
+    const base::FilePath& path,
+    const OverridePackagePathCallback& callback) {
+  package_path_overrides_.insert(std::make_pair(service_name, path));
+  callback.Run();
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // ServiceManager, private:
 
 void ServiceManager::InitCatalog(mojom::ServicePtr catalog) {
   // TODO(beng): It'd be great to build this from the manifest, however there's
   //             a bit of a chicken-and-egg problem.
   CapabilitySpec spec;
-  Interfaces interfaces;
-  interfaces.insert("filesystem::mojom::Directory");
-  spec.provided["app"] = interfaces;
-  Instance* instance = CreateInstance(CreateServiceManagerIdentity(),
-                                      CreateCatalogIdentity(),
-                                      spec);
+  spec.provided["app"].insert("filesystem::mojom::Directory");
+  spec.provided["control"].insert("catalog::mojom::CatalogControl");
+  Instance* instance = CreateInstance(
+      CreateServiceManagerIdentity(), CreateCatalogIdentity(), spec);
   singletons_.insert(kCatalogName);
   instance->StartWithService(std::move(catalog));
 }
 
 mojom::Resolver* ServiceManager::GetResolver(const Identity& identity) {
   auto iter = identity_to_resolver_.find(identity);
   if (iter != identity_to_resolver_.end())
     return iter->second.get();
 
   mojom::ResolverPtr resolver_ptr;
@@ skipping 201 matching lines @@
   params->set_target(target);
 
   // It's possible that when this manifest request was issued, another one was
   // already in-progress and completed by the time this one did, and so the
   // requested application may already be running.
   if (ConnectToExistingInstance(&params))
     return;
 
   Identity source = params->source();
 
+  auto override_iter = package_path_overrides_.find(target.name());
+  if (override_iter != package_path_overrides_.end())
+    result->package_path = override_iter->second;
+
   // Services that request "all_users" class from the Service Manager are
   // allowed to field connection requests from any user. They also run with a
   // synthetic user id generated here. The user id provided via Connect() is
   // ignored. Additionally services with the "all_users" class are not tied to
   // the lifetime of the service that started them, instead they are owned by
   // the Service Manager.
   Identity source_identity_for_creation;
   if (HasClass(capabilities, kCapabilityClass_AllUsers)) {
     singletons_.insert(target.name());
     source_identity_for_creation = CreateServiceManagerIdentity();
@@ skipping 49 matching lines @@
   // Now that the instance has a Service, we can connect to it.
   bool connected = instance->ConnectToService(&params);
   DCHECK(connected);
 }
 
 base::WeakPtr<ServiceManager> ServiceManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace shell