Service Manager: Miscellaneous catalog cleanup

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("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
 group("catalog") {
   testonly = true
   deps = [
     ":lib",
   ]
 }
 
 source_set("lib") {
   sources = [
     "catalog.cc",
     "catalog.h",
     "constants.cc",
     "constants.h",
     "entry.cc",
     "entry.h",
+    "entry_cache.cc",
+    "entry_cache.h",
     "instance.cc",
     "instance.h",
     "manifest_provider.h",
     "reader.cc",
     "reader.h",
     "store.cc",
     "store.h",
-    "types.h",
   ]
 
   deps = [
     "//base",
     "//components/filesystem:lib",
     "//services/catalog/public/interfaces",
     "//services/service_manager/public/cpp",
   ]
 
   public_deps = [
@@ skipping 19 matching lines @@
   data = [
     "//services/catalog/data/",
   ]
   deps = [
     ":lib",
     "//base",
     "//services/service_manager/public/cpp",
     "//testing/gtest",
   ]
 }