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

components/offline_pages/offline_page_model.cc

 // 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.
 
 #include "components/offline_pages/offline_page_model.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 228 matching lines @@
 }
 
 void OfflinePageModel::DoDeletePagesByOfflineId(
     const std::vector<int64_t>& offline_ids,
     const DeletePageCallback& callback) {
   DCHECK(is_loaded_);
 
   std::vector<base::FilePath> paths_to_delete;
   for (const auto& offline_id : offline_ids) {
     auto iter = offline_pages_.find(offline_id);
-    if (iter != offline_pages_.end()) {
+    if (iter != offline_pages_.end() && !iter->second.IsExpired()) {
       paths_to_delete.push_back(iter->second.file_path);
     }
   }
 
   if (paths_to_delete.empty()) {
     InformDeletePageDone(callback, DeletePageResult::NOT_FOUND);
     return;
   }
 
   archive_manager_->DeleteMultipleArchives(
@@ skipping 241 matching lines @@
 
 void OfflinePageModel::CheckForExternalFileDeletion() {
   DCHECK(is_loaded_);
 
   archive_manager_->GetAllArchives(
       base::Bind(&OfflinePageModel::ScanForMissingArchiveFiles,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void OfflinePageModel::ExpirePages(const std::vector<int64_t>& offline_ids,
-                                   const base::Time& expiration_time) {
+                                   const base::Time& expiration_time,
+                                   const base::Callback<void(bool)>& callback) {
+  std::vector<base::FilePath> paths_to_delete;
   for (int64_t offline_id : offline_ids) {
     auto iter = offline_pages_.find(offline_id);
     if (iter == offline_pages_.end())
       continue;
 
     OfflinePageItem offline_page = iter->second;
+    paths_to_delete.push_back(offline_page.file_path);
     offline_page.expiration_time = expiration_time;
 
     store_->AddOrUpdateOfflinePage(
         offline_page, base::Bind(&OfflinePageModel::OnExpirePageDone,
                                  weak_ptr_factory_.GetWeakPtr(), offline_id,
                                  expiration_time));
   }
+  archive_manager_->DeleteMultipleArchives(paths_to_delete, callback);

[jianli, 2016/05/26 21:59:31]

You can just check if paths_to_delete is empty and invoke callback if needed.

[romax, 2016/05/27 00:41:37]

Done.

 }
 
 void OfflinePageModel::OnExpirePageDone(int64_t offline_id,
                                         const base::Time& expiration_time,
                                         bool success) {
   // TODO(romax): Report UMA about successful expiration.
   if (success) {
     auto iter = offline_pages_.find(offline_id);
     if (iter != offline_pages_.end())
       iter->second.expiration_time = expiration_time;
@@ skipping 319 matching lines @@
 void OfflinePageModel::RunWhenLoaded(const base::Closure& task) {
   if (!is_loaded_) {
     delayed_tasks_.push_back(task);
     return;
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, task);
 }
 
 }  // namespace offline_pages