Moves manifest parsing to a new class, Reader.

. Consolidate value analysis in Entry
. Catalog now just manages the various data structures that allow it to implement various flavors of Resolve().

BUG=

Review URL: https://codereview.chromium.org/1821383002

Cr-Commit-Position: refs/heads/master@{#382856}

1 files changed, 54 insertions, 0 deletions

diff --git a/mojo/services/catalog/reader.h b/mojo/services/catalog/reader.h
new file mode 100644
index 0000000..d2d205f
--- /dev/null
+++ b/mojo/services/catalog/reader.h
@@ -0,0 +1,54 @@
+// 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_READER_H_
+#define MOJO_SERVICES_CATALOG_READER_H_
+
+#include "base/callback.h"
+#include "base/files/file_path.h"
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/values.h"
+
+namespace base {
+class TaskRunner;
+}
+
+namespace catalog {
+
+class Entry;
+
+// Encapsulates manifest reading.
+class Reader {
+ public:
+  using ReadManifestCallback =
+      base::Callback<void(scoped_ptr<Entry> entry)>;
+
+  // Loads manifests relative to |package_path|. Performs file operations on
+  // |file_task_runner|.
+  Reader(const base::FilePath& package_path,
+         base::TaskRunner* file_task_runner);
+  ~Reader();
+
+  // Attempts to load a manifest for |name|, and returns an Entry built from the
+  // metadata it contains via |callback|.
+  void Read(const std::string& name,
+            const ReadManifestCallback& callback);
+
+ private:
+  // Construct a manifest path for the application named |name| within
+  // |package_path_|.
+  base::FilePath GetManifestPath(const std::string& name) const;
+
+  base::FilePath package_path_;
+  base::TaskRunner* file_task_runner_;
+  base::WeakPtrFactory<Reader> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(Reader);
+};
+
+}  // namespace catalog
+
+#endif  // MOJO_SERVICES_CATALOG_READER_H_