| Index: services/service_manager/service_manager.h
|
| diff --git a/services/service_manager/service_manager.h b/services/service_manager/service_manager.h
|
| index 3711ca7218cf0ce01cd055056ba9c436213ccbeb..1fbe176019e70ba6ad4fe6929eaea42cf74aa1d3 100644
|
| --- a/services/service_manager/service_manager.h
|
| +++ b/services/service_manager/service_manager.h
|
| @@ -162,17 +162,16 @@ class ServiceManager {
|
|
|
| std::unique_ptr<ServiceOverrides> service_overrides_;
|
|
|
| - // Ownership of all root Instances. Non-root Instances are owned by their
|
| - // parent Instance.
|
| + // Ownership of all Instances.
|
| using InstanceMap = std::map<Instance*, std::unique_ptr<Instance>>;
|
| - InstanceMap root_instances_;
|
| + InstanceMap instances_;
|
|
|
| // Maps service identities to reachable instances. Note that the Instance*
|
| // values here are NOT owned by this map.
|
| std::map<Identity, Instance*> identity_to_instance_;
|
|
|
| // Always points to the ServiceManager's own Instance. Note that this
|
| - // Instance still has an entry in |root_instances_|.
|
| + // Instance still has an entry in |instances_|.
|
| Instance* service_manager_instance_;
|
|
|
| // Tracks the names of instances that are allowed to field connection requests
|
|
|