Move serialize/deserialize logic onto Entry.

mojo/services/catalog/BUILD.gn

 # 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.
 
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 import("//testing/test.gni")
 
 group("catalog") {
   testonly = true
   deps = [
     ":lib",
   ]
 }
 
 source_set("lib") {
   sources = [
-    "builder.cc",
-    "builder.h",
     "catalog.cc",
     "catalog.h",
     "entry.cc",
     "entry.h",
     "factory.cc",
     "factory.h",
     "store.cc",
     "store.h",
   ]
 
@@ skipping 11 matching lines @@
 }
 
 mojo_application_manifest("manifest") {
   application_name = "catalog"
   source = "manifest.json"
 }
 
 source_set("unittests") {
   testonly = true
   sources = [
-    "builder_unittest.cc",
+    "entry_unittest.cc",
   ]
   deps = [
     ":lib",
     "//base",
     "//mojo/shell/public/cpp",
     "//testing/gtest",
   ]
 }