Moves manifest parsing to a new class, Reader.

mojo/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 "mojo/services/catalog/entry.h"
 
 #include "base/values.h"
 #include "mojo/services/catalog/store.h"
 #include "mojo/shell/public/cpp/names.h"
 
@@ skipping 161 matching lines @@
   entry->set_display_name(display_name);
   const base::DictionaryValue* capabilities = nullptr;
   if (!value.GetDictionary(Store::kCapabilitiesKey, &capabilities)) {
     LOG(WARNING) << "Entry::Description: dictionary has no capabilities key";
     return nullptr;
   }
   if (manifest_version == 0)
     entry->set_capabilities(BuildCapabilitiesV0(*capabilities));
   else
     entry->set_capabilities(BuildCapabilitiesV1(*capabilities));
+
+  if (value.HasKey(Store::kApplicationsKey)) {
+    const base::ListValue* applications = nullptr;
+    value.GetList(Store::kApplicationsKey, &applications);
+    for (size_t i = 0; i < applications->GetSize(); ++i) {
+      const base::DictionaryValue* application = nullptr;
+      applications->GetDictionary(i, &application);
+      scoped_ptr<Entry> child = Entry::Deserialize(*application);
+      if (child)
+        entry->applications_.insert(*child);
+    }
+  }
+
   return entry;
 }
 
 bool Entry::operator==(const Entry& other) const {
   return other.name_ == name_ && other.qualifier_ == qualifier_ &&
          other.display_name_ == display_name_ &&
          other.capabilities_ == capabilities_;
 }
 
+bool Entry::operator<(const Entry& other) const {
+  return std::tie(name_, qualifier_, display_name_, capabilities_) <
+         std::tie(other.name_, other.qualifier_, other.display_name_,
+                  other.capabilities_);
+}
+
 }  // catalog