[Offline Pages] Two-step expiration in storage manager.

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 118 matching lines @@
   // accessed. Its access info, including last access time and access count,
   // will be updated. Requires that the model is loaded.
   void MarkPageAccessed(int64_t offline_id);
 
   // Deletes an offline page related to the passed |offline_id|.
   void DeletePageByOfflineId(int64_t offline_id,
                              const DeletePageCallback& callback);
 
   // Deletes offline pages related to the passed |offline_ids|.
   void DeletePagesByOfflineId(const std::vector<int64_t>& offline_ids,
-                              const DeletePageCallback& callback) override;
+                              const DeletePageCallback& callback);
 
   // Wipes out all the data by deleting all saved files and clearing the store.
   void ClearAll(const base::Closure& callback);
 
   // Deletes offline pages matching the URL predicate.
   void DeletePagesByURLPredicate(const UrlPredicate& predicate,
                                  const DeletePageCallback& callback);
 
   // Returns true via callback if there are offline pages in the given
   // |name_space|.
@@ skipping 61 matching lines @@
 
   // Checks that all of the offline pages have corresponding offline copies.
   // If a page is discovered to be missing an offline copy, its offline page
   // metadata will be removed and |OfflinePageDeleted| will be sent to model
   // observers.
   void CheckForExternalFileDeletion();
 
   // Marks pages as expired and removes their respective files from the archive
   // directory.
   void ExpirePages(const std::vector<int64_t>& offline_ids,
-                   const base::Time& expiration_time);
+                   const base::Time& expiration_time,
+                   const DeletePageCallback& callback) override;
+
+  // Remove the pages from metadata store and in memory cache map.
+  void RemovePageItems(const std::vector<int64_t>& offline_ids,

[jianli, 2016/05/24 23:43:32]

I think exposing this capability directly might be a bit risky, since the caller
might be accidentally remove offline metadata record without removing the
backing files. Suggest to narrow it down DeleteExpiredPages.

[romax, 2016/05/25 20:05:23]

I've added a check in DeletePagesByOfflineId to delete offline_ids. If there's a
file associated it would delete the file, and then it would remove all
offline_ids from in-memory map or store.

+                       const base::Callback<void(bool)>& callback) override;
 
   // Returns the policy controller.
   ClientPolicyController* GetPolicyController();
 
   // Methods for testing only:
   OfflinePageMetadataStore* GetStoreForTesting();
 
   OfflinePageStorageManager* GetStorageManager();
 
   bool is_loaded() const;
@@ skipping 140 matching lines @@
   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_