Service Manager: Miscellaneous catalog cleanup

services/catalog/entry.cc

 // Copyright 2016 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/catalog/entry.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "services/catalog/store.h"
 
@@ skipping 177 matching lines @@
   }
 
   if (value.HasKey(Store::kServicesKey)) {
     const base::ListValue* services = nullptr;
     value.GetList(Store::kServicesKey, &services);
     for (size_t i = 0; i < services->GetSize(); ++i) {
       const base::DictionaryValue* service = nullptr;
       services->GetDictionary(i, &service);
       std::unique_ptr<Entry> child = Entry::Deserialize(*service);
       if (child) {
-        child->set_package(entry.get());
-        // Caller must assume ownership of these items.
-        entry->children_.emplace_back(std::move(child));
+        child->set_parent(entry.get());
+        entry->children().emplace_back(std::move(child));
       }
     }
   }
 
   return entry;
 }
 
 bool Entry::ProvidesCapability(const std::string& capability) const {
   auto it = interface_provider_specs_.find(
       service_manager::mojom::kServiceManager_ConnectorSpec);
@@ skipping 16 matching lines @@
     const service_manager::InterfaceProviderSpec& spec) {
   interface_provider_specs_[name] = spec;
 }
 
 }  // catalog
 
 namespace mojo {
 
 // static
 service_manager::mojom::ResolveResultPtr
-TypeConverter<service_manager::mojom::ResolveResultPtr,
-              catalog::Entry>::Convert(const catalog::Entry& input) {
-  service_manager::mojom::ResolveResultPtr result(
-      service_manager::mojom::ResolveResult::New());
-  result->name = input.name();
-  const catalog::Entry& package = input.package() ? *input.package() : input;
-  result->resolved_name = package.name();
-  result->interface_provider_specs = input.interface_provider_specs();
-  if (input.package()) {
-    auto it = package.interface_provider_specs().find(
-        service_manager::mojom::kServiceManager_ConnectorSpec);
-    if (it != package.interface_provider_specs().end())
-      result->package_spec = it->second;
+TypeConverter<service_manager::mojom::ResolveResultPtr, const catalog::Entry*>
+    ::Convert(const catalog::Entry* input) {
+  service_manager::mojom::ResolveResultPtr result;
+  if (input) {
+    result = service_manager::mojom::ResolveResult::New();
+    result->name = input->name();
+    result->interface_provider_specs = input->interface_provider_specs();
+    result->package_path = input->path();
   }
-  result->package_path = package.path();
   return result;
 }
 
 // static
 catalog::mojom::EntryPtr
     TypeConverter<catalog::mojom::EntryPtr, catalog::Entry>::Convert(
         const catalog::Entry& input) {
   catalog::mojom::EntryPtr result(catalog::mojom::Entry::New());
   result->name = input.name();
   result->display_name = input.display_name();
   return result;
 }
 
 }  // namespace mojo