Move serialize/deserialize logic onto Entry.

mojo/services/catalog/catalog.cc

Index: mojo/services/catalog/catalog.cc
diff --git a/mojo/services/catalog/catalog.cc b/mojo/services/catalog/catalog.cc
index d02e1febda953f58da82c739ce70226e53d03050..a1fb3d5ff1191d2ef274c2761503470e56bbaa08 100644
--- a/mojo/services/catalog/catalog.cc
+++ b/mojo/services/catalog/catalog.cc
@@ -9,7 +9,6 @@
 #include "base/strings/string_split.h"
 #include "base/task_runner_util.h"
 #include "mojo/common/url_type_converters.h"
-#include "mojo/services/catalog/builder.h"
 #include "mojo/services/catalog/entry.h"
 #include "mojo/services/catalog/store.h"
 #include "mojo/shell/public/cpp/names.h"
@@ -120,8 +119,8 @@ void Catalog::GetEntries(mojo::Array<mojo::String> names,
       continue;
     const Entry& entry = catalog_[name];
     mojom::CatalogEntryPtr entry_ptr(mojom::CatalogEntry::New());
-    entry_ptr->display_name = entry.display_name;
-    entries[entry.name] = std::move(entry_ptr);
+    entry_ptr->display_name = entry.display_name();
+    entries[entry.name()] = std::move(entry_ptr);
   }
   callback.Run(std::move(entries));
 }
@@ -153,7 +152,8 @@ void Catalog::CompleteResolveMojoName(
   }
 
   mojo::shell::mojom::CapabilitySpecPtr capabilities_ptr =
-      mojo::shell::mojom::CapabilitySpec::From(entry_iter->second.capabilities);
+      mojo::shell::mojom::CapabilitySpec::From(
+          entry_iter->second.capabilities());
 
   callback.Run(resolved_name, qualifier, std::move(capabilities_ptr),
                file_url.spec());
@@ -193,24 +193,34 @@ void Catalog::DeserializeCatalog() {
     const base::DictionaryValue* dictionary = nullptr;
     const base::Value* v = *it;
     CHECK(v->GetAsDictionary(&dictionary));
-    const Entry entry = BuildEntry(*dictionary);
-    catalog_[entry.name] = entry;
+    Entry entry;
+    if (Entry::DeserializeResult::SUCCESS ==
+        Entry::Deserialize(*dictionary, &entry)) {
+      catalog_[entry.name()] = entry;
+    }
   }
 }
 
 void Catalog::SerializeCatalog() {
   scoped_ptr<base::ListValue> catalog(new base::ListValue);
   for (const auto& entry : catalog_)
-    catalog->Append(SerializeEntry(entry.second));
+    catalog->Append(entry.second.Serialize());
   if (store_)
     store_->UpdateStore(std::move(catalog));
 }
 
-const Entry& Catalog::DeserializeApplication(
-    const base::DictionaryValue* dictionary) {
-  Entry entry = BuildEntry(*dictionary);
-  if (catalog_.find(entry.name) == catalog_.end()) {
-    catalog_[entry.name] = entry;
+Entry::DeserializeResult Catalog::DeserializeApplication(
+    const base::DictionaryValue* dictionary,
+    Entry* out_entry) {
+  Entry entry;
+  Entry::DeserializeResult result =
+      Entry::Deserialize(*dictionary, &entry);
+  if (result != Entry::DeserializeResult::SUCCESS)
+    return result;
+
+  // TODO(beng): move raw dictionary analysis into Deserialize().
+  if (catalog_.find(entry.name()) == catalog_.end()) {
+    catalog_[entry.name()] = entry;
 
     if (dictionary->HasKey("applications")) {
       const base::ListValue* applications = nullptr;
@@ -218,14 +228,19 @@ const Entry& Catalog::DeserializeApplication(
       for (size_t i = 0; i < applications->GetSize(); ++i) {
         const base::DictionaryValue* child_value = nullptr;
         applications->GetDictionary(i, &child_value);
-        const Entry& child = DeserializeApplication(child_value);
-        mojo_name_aliases_[child.name] =
-            std::make_pair(entry.name, child.qualifier);
+        Entry child;
+        if (Entry::DeserializeResult::SUCCESS ==
+            DeserializeApplication(child_value, &child)) {
+          mojo_name_aliases_[child.name()] =
+              std::make_pair(entry.name(), child.qualifier());
+        }
       }
     }
-    qualifiers_[entry.name] = entry.qualifier;
+    qualifiers_[entry.name()] = entry.qualifier();
   }
-  return catalog_[entry.name];
+  if (out_entry)
+    *out_entry = catalog_[entry.name()];
+  return result;
 }
 
 GURL Catalog::GetManifestURL(const std::string& name) {
@@ -259,13 +274,13 @@ void Catalog::OnReadManifestImpl(const std::string& name,
   if (manifest) {
     base::DictionaryValue* dictionary = nullptr;
     CHECK(manifest->GetAsDictionary(&dictionary));
-    DeserializeApplication(dictionary);
+    DeserializeApplication(dictionary, nullptr);
   } else {
     Entry entry;
-    entry.name = name;
-    entry.display_name = name;
-    catalog_[entry.name] = entry;
-    qualifiers_[entry.name] = mojo::GetNamePath(name);
+    entry.set_name(name);
+    entry.set_display_name(name);
+    catalog_[entry.name()] = entry;
+    qualifiers_[entry.name()] = mojo::GetNamePath(name);
   }
   SerializeCatalog();