[Offline pages] Adding expiration capability to OfflinePageModel

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 938 matching lines @@
               std::get<0>(save_result));
   }
 
   const OfflinePageItem* offline_page =
       model()->MaybeGetBestPageForOnlineURL(kTestUrl);
   ASSERT_TRUE(nullptr != offline_page);
 
   EXPECT_EQ(std::get<1>(saved_pages[1]), offline_page->offline_id);
 }
 
+TEST_F(OfflinePageModelTest, ExpirePages) {
+  // We will save 3 pages and then expire 2 of them.
+  std::pair<SavePageResult, int64_t> saved_pages[3];
+  saved_pages[0] = SavePage(kTestUrl, kTestClientId1);
+  saved_pages[1] = SavePage(kTestUrl2, kTestClientId2);
+  saved_pages[2] = SavePage(kTestUrl3, kTestClientId3);
+
+  for (const auto& save_result : saved_pages) {
+    ASSERT_EQ(OfflinePageModel::SavePageResult::SUCCESS,
+              std::get<0>(save_result));

[bburns, 2016/05/20 18:23:27]

does this fit on the previous line?

[fgorski, 2016/05/20 20:54:54]

misses it by 3. git cl format argument again.

+  }
+
+  // First two pages will be expired.
+  std::vector<int64_t> pages_to_expire = {std::get<1>(saved_pages[0]),

[bburns, 2016/05/20 18:23:27]

personally I would break the line at the '='

[fgorski, 2016/05/20 20:54:54]

git cl format

+                                          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);
+  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());
+    }
+  }
+}
+
 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(
       offline_pages::kOfflineBookmarksFeature.name, "");
   base::FeatureList::SetInstance(std::move(feature_list));
@@ skipping 40 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