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

components/offline_pages/offline_page_model.h

Index: components/offline_pages/offline_page_model.h
diff --git a/components/offline_pages/offline_page_model.h b/components/offline_pages/offline_page_model.h
index 0e336ccf4144bdf21a1cb799879efa31d07dbb7f..09cc49aaab46f416d893dfce7c5061b54bfb63c7 100644
--- a/components/offline_pages/offline_page_model.h
+++ b/components/offline_pages/offline_page_model.h
@@ -136,7 +136,7 @@ class OfflinePageModel : public KeyedService,
 
   // 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);
@@ -218,7 +218,12 @@ class OfflinePageModel : public KeyedService,
   // 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();