[Offline Pages] Updated clearing logic in storage manager.

components/offline_pages/offline_page_model_unittest.cc

Index: components/offline_pages/offline_page_model_unittest.cc
diff --git a/components/offline_pages/offline_page_model_unittest.cc b/components/offline_pages/offline_page_model_unittest.cc
index 3179a253a42b99f29b0ab0e30a58ae93bf473de9..bf4adfa41446ead6337c4d756935ebac90fad3f1 100644
--- a/components/offline_pages/offline_page_model_unittest.cc
+++ b/components/offline_pages/offline_page_model_unittest.cc
@@ -29,6 +29,7 @@
 #include "components/offline_pages/offline_page_test_archiver.h"
 #include "components/offline_pages/offline_page_test_store.h"
 #include "components/offline_pages/offline_page_types.h"
+#include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ -87,7 +88,6 @@ class OfflinePageModelTest
   void OnGetMultipleOfflinePageItemsResult(
       MultipleOfflinePageItemResult* storage,
       const MultipleOfflinePageItemResult& result);
-  void OnClearPageByStorageManager(int pages_cleared, DeletePageResult result);
 
   // OfflinePageMetadataStore callbacks.
   void OnStoreUpdateDone(bool /* success */);
@@ -266,7 +266,8 @@ std::unique_ptr<OfflinePageMetadataStore> OfflinePageModelTest::BuildStore() {
 std::unique_ptr<OfflinePageModel> OfflinePageModelTest::BuildModel(
     std::unique_ptr<OfflinePageMetadataStore> store) {
   return std::unique_ptr<OfflinePageModel>(new OfflinePageModel(
-      std::move(store), temp_dir_.path(), base::ThreadTaskRunnerHandle::Get()));
+      std::move(store), temp_dir_.path(), base::ThreadTaskRunnerHandle::Get(),
+      new TestingPrefServiceSimple()));
 }
 
 void OfflinePageModelTest::ResetModel() {
@@ -388,13 +389,6 @@ void OfflinePageModelTest::OnGetMultipleOfflinePageItemsResult(
   *storage = result;
 }
 
-void OfflinePageModelTest::OnClearPageByStorageManager(
-    int pages_cleared,
-    DeletePageResult result) {
-  last_cleared_pages_count_ = pages_cleared;
-  last_clear_page_result_ = result;
-}
-
 base::Optional<OfflinePageItem> OfflinePageModelTest::GetPagesByOnlineURL(
     const GURL& online_url) {
   MultipleOfflinePageItemResult result;
@@ -943,40 +937,6 @@ TEST_F(OfflinePageModelTest, SaveRetrieveMultipleClientIds) {
   EXPECT_TRUE(id_set.find(offline2) != id_set.end());
 }
 
-TEST_F(OfflinePageModelTest, ClearPagesFromOneSource) {
-  base::Time now = base::Time::Now();
-  base::TimeDelta expiration_period = model()
-                                          ->GetPolicyController()
-                                          ->GetPolicy(kTestClientNamespace)
-                                          .lifetime_policy.expiration_period;
-
-  SavePage(kTestUrl, kTestClientId1);
-  GetStore()->UpdateLastAccessTime(
-      last_save_offline_id(),
-      now - base::TimeDelta::FromDays(10) - expiration_period);
-  SavePage(kTestUrl2, kTestClientId2);
-  GetStore()->UpdateLastAccessTime(
-      last_save_offline_id(),
-      now - base::TimeDelta::FromDays(1) - expiration_period);
-  SavePage(kTestUrl3, kTestClientId3);
-  GetStore()->UpdateLastAccessTime(last_save_offline_id(), now);
-
-  ResetModel();
-
-  // Only first two pages are expired.
-  model()->GetStorageManager()->ClearPagesIfNeeded(base::Bind(
-      &OfflinePageModelTest::OnClearPageByStorageManager, AsWeakPtr()));
-
-  PumpLoop();
-
-  std::vector<OfflinePageItem> offline_pages = GetAllPages();
-
-  EXPECT_EQ(1UL, offline_pages.size());
-  EXPECT_EQ(1UL, GetStore()->GetAllPages().size());
-  EXPECT_EQ(2, last_cleared_pages_count());
-  EXPECT_EQ(DeletePageResult::SUCCESS, last_clear_page_result());
-}
-
 TEST_F(OfflinePageModelTest, GetBestPage) {
   // We will save 3 pages - two for the same URL, and one for a different URL.
   // Correct behavior will pick the most recently saved page for the correct