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

components/offline_pages/offline_page_model.cc

Index: components/offline_pages/offline_page_model.cc
diff --git a/components/offline_pages/offline_page_model.cc b/components/offline_pages/offline_page_model.cc
index beb622cafba81da6ccb0c704dd381c956dde9c9b..de699d8bf0da15f9a408051bd64841285ec9acfc 100644
--- a/components/offline_pages/offline_page_model.cc
+++ b/components/offline_pages/offline_page_model.cc
@@ -508,7 +508,8 @@ void OfflinePageModel::CheckForExternalFileDeletion() {
 }
 
 void OfflinePageModel::ExpirePages(const std::vector<int64_t>& offline_ids,
-                                   const base::Time& expiration_time) {
+                                   const base::Time& expiration_time,
+                                   const DeletePageCallback& callback) {
   for (int64_t offline_id : offline_ids) {
     auto iter = offline_pages_.find(offline_id);
     if (iter == offline_pages_.end())
@@ -522,6 +523,13 @@ void OfflinePageModel::ExpirePages(const std::vector<int64_t>& offline_ids,
                                  weak_ptr_factory_.GetWeakPtr(), offline_id,
                                  expiration_time));
   }
+  DeletePagesByOfflineId(offline_ids, callback);

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

I don't think we want to delete offline page metadata record from the store. We
only intend to delete the offline file.

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

Done.

+}
+
+void OfflinePageModel::RemovePageItems(
+    const std::vector<int64_t>& offline_ids,
+    const base::Callback<void(bool)>& callback) {
+  store_->RemoveOfflinePages(offline_ids, callback);
 }
 
 void OfflinePageModel::OnExpirePageDone(int64_t offline_id,
@@ -687,7 +695,7 @@ void OfflinePageModel::OnDeleteArchiveFilesDone(
     return;
   }
 
-  store_->RemoveOfflinePages(
+  RemovePageItems(
       offline_ids,
       base::Bind(&OfflinePageModel::OnRemoveOfflinePagesDone,
                  weak_ptr_factory_.GetWeakPtr(), offline_ids, callback));
@@ -785,12 +793,11 @@ void OfflinePageModel::ScanForMissingArchiveFiles(
       base::Bind(&OfflinePageModel::OnRemoveOfflinePagesMissingArchiveFileDone,
                  weak_ptr_factory_.GetWeakPtr(), offline_client_id_pairs));
 
-  store_->RemoveOfflinePages(
-      ids_of_pages_missing_archive_file,
-      base::Bind(&OfflinePageModel::OnRemoveOfflinePagesDone,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 ids_of_pages_missing_archive_file,
-                 remove_pages_done_callback));
+  RemovePageItems(ids_of_pages_missing_archive_file,
+                  base::Bind(&OfflinePageModel::OnRemoveOfflinePagesDone,
+                             weak_ptr_factory_.GetWeakPtr(),
+                             ids_of_pages_missing_archive_file,
+                             remove_pages_done_callback));
 }
 
 void OfflinePageModel::OnRemoveOfflinePagesMissingArchiveFileDone(