[ServiceManager] Eliminate parent-child relationship between services

services/service_manager/service_manager.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
 #define SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 144 matching lines @@
   void OnGotResolvedName(std::unique_ptr<ConnectParams> params,
                          mojom::ServicePtr service,
                          bool has_source_instance,
                          base::WeakPtr<Instance> source_instance,
                          mojom::ResolveResultPtr result);
 
   base::WeakPtr<ServiceManager> GetWeakPtr();
 
   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
   // from all users.
   std::set<std::string> singletons_;
 
   std::map<Identity, mojom::ServiceFactoryPtr> service_factories_;
   std::map<Identity, mojom::ResolverPtr> identity_to_resolver_;
   mojo::InterfacePtrSet<mojom::ServiceManagerListener> listeners_;
   base::Callback<void(const Identity&)> instance_quit_callback_;
   std::unique_ptr<NativeRunnerFactory> native_runner_factory_;
   std::unique_ptr<ServiceContext> service_context_;
   base::WeakPtrFactory<ServiceManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManager);
 };
 
 mojom::Connector::ConnectCallback EmptyConnectCallback();
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_