Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

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/values.h"
 #include "services/catalog/store.h"
 #include "services/shell/public/cpp/names.h"
 
@@ skipping 105 matching lines @@
     }
   }
   return true;
 }
 
 }  // namespace
 
 Entry::Entry() {}
 Entry::Entry(const std::string& name)
     : name_(name), qualifier_(shell::GetNamePath(name)), display_name_(name) {}
+Entry::Entry(const Entry& other) = default;
 Entry::~Entry() {}
 
 std::unique_ptr<base::DictionaryValue> Entry::Serialize() const {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue);
   value->SetInteger(Store::kManifestVersionKey, 1);
   value->SetString(Store::kNameKey, name_);
   value->SetString(Store::kDisplayNameKey, display_name_);
   value->SetString(Store::kQualifierKey, qualifier_);
   std::unique_ptr<base::DictionaryValue> spec(new base::DictionaryValue);
 
@@ skipping 97 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));
+        entry->services_.insert(child.release());
       }
     }
   }
 
   return entry;
 }
 
 bool Entry::ProvidesClass(const std::string& clazz) const {
   return capabilities_.provided.find(clazz) != capabilities_.provided.end();
 }
@@ skipping 33 matching lines @@
 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