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

components/offline_pages/offline_page_model_unittest.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 <stdint.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 69 matching lines @@
   void OnCheckPagesExistOfflineDone(const CheckPagesExistOfflineResult& result);
   void OnClearAllDone();
   void OnGetOfflineIdsForClientIdDone(MultipleOfflineIdResult* storage,
                                       const MultipleOfflineIdResult& result);
   void OnGetSingleOfflinePageItemResult(
       SingleOfflinePageItemResult* storage,
       const SingleOfflinePageItemResult& result);
   void OnGetMultipleOfflinePageItemsResult(
       MultipleOfflinePageItemResult* storage,
       const MultipleOfflinePageItemResult& result);
+  void OnPagesExpired(bool result);
 
   // OfflinePageMetadataStore callbacks.
   void OnStoreUpdateDone(bool /* success */);
 
   std::unique_ptr<OfflinePageTestArchiver> BuildArchiver(
       const GURL& url,
       OfflinePageArchiver::ArchiverResult result);
   std::unique_ptr<OfflinePageMetadataStore> BuildStore();
   std::unique_ptr<OfflinePageModel> BuildModel(
       std::unique_ptr<OfflinePageMetadataStore> store);
@@ skipping 56 matching lines @@
   ClientId last_deleted_client_id() const { return last_deleted_client_id_; }
 
   const base::FilePath& last_archiver_path() { return last_archiver_path_; }
 
   int last_cleared_pages_count() const { return last_cleared_pages_count_; }
 
   DeletePageResult last_clear_page_result() const {
     return last_clear_page_result_;
   }
 
+  bool last_expire_page_result() const { return last_expire_page_result_; }
+
  private:
   scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
   base::ScopedTempDir temp_dir_;
 
   std::unique_ptr<OfflinePageModel> model_;
   SavePageResult last_save_result_;
   int64_t last_save_offline_id_;
   DeletePageResult last_delete_result_;
   base::FilePath last_archiver_path_;
   int64_t last_deleted_offline_id_;
   ClientId last_deleted_client_id_;
   bool last_has_pages_result_;
   CheckPagesExistOfflineResult last_pages_exist_result_;
   int last_cleared_pages_count_;
   DeletePageResult last_clear_page_result_;
+  bool last_expire_page_result_;
 };
 
 OfflinePageModelTest::OfflinePageModelTest()
     : task_runner_(new base::TestMockTimeTaskRunner),
       task_runner_handle_(task_runner_),
       last_save_result_(SavePageResult::CANCELLED),
       last_save_offline_id_(-1),
       last_delete_result_(DeletePageResult::CANCELLED),
       last_deleted_offline_id_(-1) {}
 
@@ skipping 188 matching lines @@
     const SingleOfflinePageItemResult& result) {
   *storage = result;
 }
 
 void OfflinePageModelTest::OnGetMultipleOfflinePageItemsResult(
     MultipleOfflinePageItemResult* storage,
     const MultipleOfflinePageItemResult& result) {
   *storage = result;
 }
 
+void OfflinePageModelTest::OnPagesExpired(bool result) {
+  last_expire_page_result_ = result;
+}
+
 base::Optional<OfflinePageItem> OfflinePageModelTest::GetPagesByOnlineURL(
     const GURL& online_url) {
   MultipleOfflinePageItemResult result;
   model()->GetPagesByOnlineURL(
       online_url,
       base::Bind(&OfflinePageModelTest::OnGetMultipleOfflinePageItemsResult,
                  AsWeakPtr(), base::Unretained(&result)));
   PumpLoop();
   if (result.size() > 0)
     return base::make_optional(result[0]);
@@ skipping 568 matching lines @@
               std::get<0>(save_result));
   }
 
   // First two pages will be expired.
   std::vector<int64_t> pages_to_expire = {std::get<1>(saved_pages[0]),
                                           std::get<1>(saved_pages[1])};
   // Pages are marked as expired if they have an expiration_time set.
   base::Time expiration_time =
       base::Time::Now() + base::TimeDelta::FromMinutes(5);
 
-  model()->ExpirePages(pages_to_expire, expiration_time);
+  model()->ExpirePages(
+      pages_to_expire, expiration_time,
+      base::Bind(&OfflinePageModelTest::OnPagesExpired, AsWeakPtr()));
   PumpLoop();
 
   const std::vector<OfflinePageItem>& offline_pages = GetAllPages();
   for (const auto& offline_page : offline_pages) {
     if (std::find(pages_to_expire.begin(), pages_to_expire.end(),
                   offline_page.offline_id) != pages_to_expire.end()) {
       EXPECT_EQ(expiration_time, offline_page.expiration_time);
       EXPECT_TRUE(offline_page.IsExpired());
     } else {
       EXPECT_EQ(base::Time(), offline_page.expiration_time);
       EXPECT_FALSE(offline_page.IsExpired());
     }
   }
+  EXPECT_TRUE(last_expire_page_result());
 }
 
 TEST(CommandLineFlagsTest, OfflineBookmarks) {
   // Disabled by default.
   EXPECT_FALSE(offline_pages::IsOfflineBookmarksEnabled());
 
   // Check if feature is correctly enabled by command-line flag.
   base::FeatureList::ClearInstanceForTesting();
   std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
   feature_list->InitializeFromCommandLine(
@@ skipping 42 matching lines @@
   std::unique_ptr<base::FeatureList> feature_list2(new base::FeatureList);
   feature_list2->InitializeFromCommandLine(
       std::string(offline_pages::kOfflineBookmarksFeature.name) + "," +
           offline_pages::kOfflinePagesBackgroundLoadingFeature.name,
       "");
   base::FeatureList::SetInstance(std::move(feature_list2));
   EXPECT_TRUE(offline_pages::IsOfflinePagesBackgroundLoadingEnabled());
 }
 
 }  // namespace offline_pages