[Offline Pages] Filtering expired pages and fix consistency check.

components/offline_pages/offline_page_model_impl.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 COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 85 matching lines @@
   const OfflinePageItem* MaybeGetPageByOfflineURL(
       const GURL& offline_url) const override;
   void GetPagesByOnlineURL(
       const GURL& online_url,
       const MultipleOfflinePageItemCallback& callback) override;
   void GetBestPageForOnlineURL(
       const GURL& online_url,
       const SingleOfflinePageItemCallback callback) override;
   const OfflinePageItem* MaybeGetBestPageForOnlineURL(
       const GURL& online_url) const override;
-  void CheckForExternalFileDeletion() override;
+  void CheckMetadataConsistency() override;
   void ExpirePages(const std::vector<int64_t>& offline_ids,
                    const base::Time& expiration_time,
                    const base::Callback<void(bool)>& callback) override;
   ClientPolicyController* GetPolicyController() override;
 
   // Methods for testing only:
   OfflinePageMetadataStore* GetStoreForTesting();
 
   OfflinePageStorageManager* GetStorageManager();
 
@@ skipping 69 matching lines @@
                                 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 ScanForMissingArchiveFiles(
+  // Callbacks for checking metadata consistency.
+  void DoCheckMetadataConsistency(
       const std::set<base::FilePath>& archive_paths);
-  void OnRemoveOfflinePagesMissingArchiveFileDone(
-      const std::vector<std::pair<int64_t, ClientId>>& offline_client_id_pairs,
-      DeletePageResult result);
+  // Callback called after headless archives deleted. Orphaned archives are
+  // archives files on disk which are not pointed to by any of the page items
+  // in metadata store.
+  void ExpirePagesMissingArchiveFile(
+      const std::set<base::FilePath>& archive_paths);
+  void OnExpirePagesMissingArchiveFileDone(
+      const std::vector<int64_t>& offline_ids,
+      bool success);
+  void DeleteOrphanedArchives(const std::set<base::FilePath>& archive_paths);
+  void OnDeleteOrphanedArchivesDone(const std::vector<base::FilePath>& archives,
+                                    bool success);
 
   // 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,
       OfflinePageMetadataStore::LoadStatus load_status,
       const std::vector<OfflinePageItem>& offline_pages);
 
@@ skipping 54 matching lines @@
   std::unique_ptr<ArchiveManager> archive_manager_;
 
   base::WeakPtrFactory<OfflinePageModelImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModelImpl);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_