| Index: services/catalog/catalog.h
|
| diff --git a/services/catalog/catalog.h b/services/catalog/catalog.h
|
| index 870817fafc0a8b5d3884b305676e684fdf3276bd..691139c8341882e2a5f7c743e6a73f07969e043d 100644
|
| --- a/services/catalog/catalog.h
|
| +++ b/services/catalog/catalog.h
|
| @@ -24,6 +24,7 @@
|
| namespace base {
|
| class SequencedWorkerPool;
|
| class SingleThreadTaskRunner;
|
| +class Value;
|
| }
|
|
|
| namespace filesystem {
|
| @@ -39,7 +40,6 @@ namespace catalog {
|
| class Instance;
|
| class ManifestProvider;
|
| class Reader;
|
| -class Store;
|
|
|
| // Creates and owns an instance of the catalog. Exposes a ServicePtr that
|
| // can be passed to the service manager, potentially in a different process.
|
| @@ -51,13 +51,16 @@ class Catalog
|
| public service_manager::InterfaceFactory<mojom::CatalogControl>,
|
| public mojom::CatalogControl {
|
| public:
|
| + // Constructs a catalog over a static manifest. This catalog never performs
|
| + // file I/O.
|
| + explicit Catalog(std::unique_ptr<base::Value> static_manifest);
|
| +
|
| // |manifest_provider| may be null.
|
| Catalog(base::SequencedWorkerPool* worker_pool,
|
| - std::unique_ptr<Store> store,
|
| ManifestProvider* manifest_provider);
|
| Catalog(base::SingleThreadTaskRunner* task_runner,
|
| - std::unique_ptr<Store> store,
|
| ManifestProvider* manifest_provider);
|
| +
|
| ~Catalog() override;
|
|
|
| // By default, "foo" resolves to a package named "foo". This allows
|
| @@ -71,7 +74,7 @@ class Catalog
|
| private:
|
| class ServiceImpl;
|
|
|
| - explicit Catalog(std::unique_ptr<Store> store);
|
| + Catalog();
|
|
|
| // Starts a scane for system packages.
|
| void ScanSystemPackageDir();
|
| @@ -102,8 +105,6 @@ class Catalog
|
|
|
| void SystemPackageDirScanned();
|
|
|
| - std::unique_ptr<Store> store_;
|
| -
|
| service_manager::mojom::ServicePtr service_;
|
| std::unique_ptr<service_manager::ServiceContext> service_context_;
|
|
|
|
|