[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 957 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::OnDeletePageDone, 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_EQ(DeletePageResult::SUCCESS, last_delete_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