Service Manager: Miscellaneous catalog cleanup

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 137 matching lines @@
 
   // Callback when remote Catalog resolves mojo:foo to mojo:bar.
   // |params| are the params passed to Connect().
   // |service| if provided is a ServicePtr which should be used to manage the
   // new application instance. This may be null.
   // |result| contains the result of the resolve operation.
   void OnGotResolvedName(std::unique_ptr<ConnectParams> params,
                          mojom::ServicePtr service,
                          bool has_source_instance,
                          base::WeakPtr<Instance> source_instance,
-                         mojom::ResolveResultPtr result);
+                         mojom::ResolveResultPtr result,
+                         mojom::ResolveResultPtr parent);
 
   base::WeakPtr<ServiceManager> GetWeakPtr();
 
   std::unique_ptr<ServiceOverrides> service_overrides_;
 
   // Ownership of all Instances.
   using InstanceMap = std::map<Instance*, std::unique_ptr<Instance>>;
   InstanceMap instances_;
 
   // Maps service identities to reachable instances. Note that the Instance*
@@ skipping 18 matching lines @@
   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_