Move serialize/deserialize logic onto Entry.

mojo/services/catalog/catalog.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 MOJO_SERVICES_CATALOG_CATALOG_H_
 #define MOJO_SERVICES_CATALOG_CATALOG_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
@@ skipping 58 matching lines @@
   // Attempts to load a manifest for |name|, reads it and adds its metadata to
   // the catalog.
   void AddNameToCatalog(const std::string& name,
                         const ResolveMojoNameCallback& callback);
 
   // Populate/serialize the catalog from/to the supplied store.
   void DeserializeCatalog();
   void SerializeCatalog();
 
   // Construct a catalog entry from |dictionary|.
-  const Entry& DeserializeApplication(const base::DictionaryValue* dictionary);
+  Entry::DeserializeResult DeserializeApplication(
+      const base::DictionaryValue* dictionary,
+      Entry* out_entry);
 
   GURL GetManifestURL(const std::string& name);
 
   // Called once the manifest has been read. |pm| may be null at this point,
   // but |callback| must be run.
   static void OnReadManifest(base::WeakPtr<Catalog> catalog,
                              const std::string& name,
                              const ResolveMojoNameCallback& callback,
                              scoped_ptr<base::Value> manifest);
 
@@ skipping 20 matching lines @@
   std::map<std::string, std::string> qualifiers_;
 
   base::WeakPtrFactory<Catalog> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Catalog);
 };
 
 }  // namespace catalog
 
 #endif  // MOJO_SERVICES_CATALOG_CATALOG_H_