Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

services/catalog/entry.h

 // 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.
 
 #ifndef SERVICES_CATALOG_ENTRY_H_
 #define SERVICES_CATALOG_ENTRY_H_
 
 #include <memory>
+#include <set>
 #include <string>
-#include <vector>
 
 #include "base/files/file_path.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "services/shell/public/cpp/capabilities.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace catalog {
 
 // Static information about a service package known to the Catalog.
 class Entry {
  public:
   Entry();
   explicit Entry(const std::string& name);
+  explicit Entry(const Entry& other);
   ~Entry();
 
   std::unique_ptr<base::DictionaryValue> Serialize() const;
 
   // If the constructed Entry is a package that provides other Entrys, the
   // caller must assume ownership of the tree of Entrys by enumerating
   // services().
   static std::unique_ptr<Entry> Deserialize(const base::DictionaryValue& value);
 
   bool ProvidesClass(const std::string& clazz) const;
@@ skipping 10 matching lines @@
   const std::string& display_name() const { return display_name_; }
   void set_display_name(const std::string& display_name) {
     display_name_ = display_name;
   }
   const shell::CapabilitySpec& capabilities() const { return capabilities_; }
   void set_capabilities(const shell::CapabilitySpec& capabilities) {
     capabilities_ = capabilities;
   }
   const Entry* package() const { return package_; }
   void set_package(Entry* package) { package_ = package; }
-
-  std::vector<std::unique_ptr<Entry>> TakeChildren() {
-    return std::move(children_);
-  }
+  const std::set<Entry*>& services() { return services_; }
 
  private:
   std::string name_;
   base::FilePath path_;
   std::string qualifier_;
   std::string display_name_;
   shell::CapabilitySpec capabilities_;
   Entry* package_ = nullptr;
-  std::vector<std::unique_ptr<Entry>> children_;
+  std::set<Entry*> services_;
 };
 
 }  // namespace catalog
 
 namespace mojo {
 template <>
 struct TypeConverter<shell::mojom::ResolveResultPtr, catalog::Entry> {
   static shell::mojom::ResolveResultPtr Convert(const catalog::Entry& input);
 };
 
 template<>
 struct TypeConverter<catalog::mojom::EntryPtr, catalog::Entry> {
   static catalog::mojom::EntryPtr Convert(const catalog::Entry& input);
 };
 
 }  // namespace mojo
 
 #endif  // SERVICES_CATALOG_ENTRY_H_