[Offline pages] Hooking up Archive Manager to Offline Page Model

components/offline_pages/offline_page_model.h

 // Copyright 2015 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 COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 24 matching lines @@
 class TimeDelta;
 class TimeTicks;
 }  // namespace base
 
 namespace offline_pages {
 
 static const char* const kBookmarkNamespace = "bookmark";
 static const int64_t kInvalidOfflineId = 0;
 
 struct ClientId;
+struct OfflinePageItem;
 
+class ArchiveManager;
 class ClientPolicyController;
-struct OfflinePageItem;
 class OfflinePageMetadataStore;
 class OfflinePageStorageManager;
 
 // Service for saving pages offline, storing the offline copy and metadata, and
 // retrieving them upon request.
 //
 // Example usage:
 //   class ArchiverImpl : public OfflinePageArchiver {
 //     // This is a class that knows how to create archiver
 //     void CreateArchiver(...) override;
@@ skipping 234 matching lines @@
                             const OfflinePageItem& offline_page,
                             bool success);
   void InformSavePageDone(const SavePageCallback& callback,
                           SavePageResult result,
                           int64_t offline_id);
   void DeletePendingArchiver(OfflinePageArchiver* archiver);
 
   // Steps for deleting files and data for an offline page.
   void OnDeleteArchiveFilesDone(const std::vector<int64_t>& offline_ids,
                                 const DeletePageCallback& callback,
-                                const bool* success);
+                                bool success);
   void OnRemoveOfflinePagesDone(const std::vector<int64_t>& offline_ids,
                                 const DeletePageCallback& callback,
                                 bool success);
   void InformDeletePageDone(const DeletePageCallback& callback,
                             DeletePageResult result);
 
   void OnMarkPageAccesseDone(const OfflinePageItem& offline_page_item,
                              bool success);
 
   // Callbacks for checking if offline pages are missing archive files.
-  void OnFindPagesMissingArchiveFile(
-      const std::vector<int64_t>* ids_of_pages_missing_archive_file);
+  void ScanForMissingArchivePaths(
+      const std::set<base::FilePath>& archive_paths);
   void OnRemoveOfflinePagesMissingArchiveFileDone(
       const std::vector<std::pair<int64_t, ClientId>>& offline_client_id_pairs,
       DeletePageResult result);
 
   // Steps for clearing all.
   void OnRemoveAllFilesDoneForClearAll(const base::Closure& callback,
                                        DeletePageResult result);
   void OnResetStoreDoneForClearAll(const base::Closure& callback, bool success);
   void OnReloadStoreDoneForClearAll(
       const base::Closure& callback,
@@ skipping 20 matching lines @@
   base::FilePath archives_dir_;
 
   // The observers.
   base::ObserverList<Observer> observers_;
 
   bool is_loaded_;
 
   // In memory copy of the offline page metadata, keyed by bookmark IDs.
   std::map<int64_t, OfflinePageItem> offline_pages_;
 
-  scoped_refptr<base::SequencedTaskRunner> task_runner_;
-
   // Pending archivers owned by this model.
   PendingArchivers pending_archivers_;
 
   // Delayed tasks that should be invoked after the loading is done.
   std::vector<base::Closure> delayed_tasks_;
 
   // Controller of the client policies.
   std::unique_ptr<ClientPolicyController> policy_controller_;
 
   // Manager for the storage consumed by archives and responsible for
   // automatic page clearing.
   std::unique_ptr<OfflinePageStorageManager> storage_manager_;
 
+  // Manager for the offline archive files and directory, where these files are

[jianli, 2016/05/17 21:48:13]

I think you can skip "directory, where ..." in the comment.

[fgorski, 2016/05/17 22:50:29]

Done.

+  // stored.
+  std::unique_ptr<ArchiveManager> archive_manager_;
+
   base::WeakPtrFactory<OfflinePageModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModel);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_