Service Manager: Miscellaneous catalog cleanup

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 SERVICES_CATALOG_CATALOG_H_
 #define SERVICES_CATALOG_CATALOG_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
-#include "services/catalog/types.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/interfaces/resolver.mojom.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
 
 namespace base {
 class SequencedWorkerPool;
 class SingleThreadTaskRunner;
 class Value;
 }
 
 namespace filesystem {
 class LockTable;
 }
 
 namespace service_manager {
 class ServiceContext;
 }
 
 namespace catalog {
 
+class EntryCache;
 class Instance;
 class ManifestProvider;
 class Reader;
 
 // Creates and owns an instance of the catalog. Exposes a ServicePtr that
 // can be passed to the service manager, potentially in a different process.
 class Catalog
     : public service_manager::InterfaceFactory<mojom::Catalog>,
       public service_manager::InterfaceFactory<filesystem::mojom::Directory>,
       public service_manager::InterfaceFactory<
@@ skipping 54 matching lines @@
   Instance* GetInstanceForUserId(const std::string& user_id);
 
   void SystemPackageDirScanned();
 
   service_manager::mojom::ServicePtr service_;
   std::unique_ptr<service_manager::ServiceContext> service_context_;
 
   std::map<std::string, std::unique_ptr<Instance>> instances_;
 
   std::unique_ptr<Reader> system_reader_;
-  EntryCache system_cache_;
+  const std::unique_ptr<EntryCache> system_cache_;
   bool loaded_ = false;
 
   scoped_refptr<filesystem::LockTable> lock_table_;
 
   mojo::BindingSet<mojom::CatalogControl> control_bindings_;
 
   base::WeakPtrFactory<Catalog> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Catalog);
 };
 
 }  // namespace catalog
 
 #endif  // SERVICES_CATALOG_CATALOG_H_