| Index: components/previews/core/previews_black_list_unittest.cc
|
| diff --git a/components/previews/core/previews_black_list_unittest.cc b/components/previews/core/previews_black_list_unittest.cc
|
| index d9fd376183c263b64f159a2df011c60cb69283f5..a0864dab466ec3f0a90917664832a215d45692e9 100644
|
| --- a/components/previews/core/previews_black_list_unittest.cc
|
| +++ b/components/previews/core/previews_black_list_unittest.cc
|
| @@ -75,20 +75,21 @@ TEST_F(PreviewsBlackListTest, BlackListNoStore) {
|
| params["black_list_duration_in_days"] = base::IntToString(duration_in_days);
|
| ASSERT_TRUE(
|
| variations::AssociateVariationParams("ClientSidePreviews", "Enabled",
|
| params) &&
|
| base::FieldTrialList::CreateFieldTrial("ClientSidePreviews", "Enabled"));
|
|
|
| base::Clock* test_clock = new base::SimpleTestClock();
|
|
|
| std::unique_ptr<PreviewsBlackList> black_list(
|
| new PreviewsBlackList(nullptr, base::WrapUnique(test_clock)));
|
| + black_list->Initialize();
|
|
|
| EXPECT_TRUE(black_list->IsLoadedAndAllowed(url_a, PreviewsType::OFFLINE));
|
| EXPECT_TRUE(black_list->IsLoadedAndAllowed(url_b, PreviewsType::OFFLINE));
|
|
|
| black_list->AddPreviewNavigation(url_a, true, PreviewsType::OFFLINE);
|
| black_list->AddPreviewNavigation(url_a, true, PreviewsType::OFFLINE);
|
|
|
| EXPECT_FALSE(black_list->IsLoadedAndAllowed(url_a, PreviewsType::OFFLINE));
|
| EXPECT_TRUE(black_list->IsLoadedAndAllowed(url_b, PreviewsType::OFFLINE));
|
|
|
| @@ -126,20 +127,21 @@ TEST_F(PreviewsBlackListTest, BlackListWithStore) {
|
| params) &&
|
| base::FieldTrialList::CreateFieldTrial("ClientSidePreviews", "Enabled"));
|
|
|
| base::MessageLoop loop;
|
|
|
| base::Clock* test_clock = new base::SimpleTestClock();
|
|
|
| std::unique_ptr<PreviewsBlackList> black_list(
|
| new PreviewsBlackList(base::MakeUnique<TestPreviewsOptOutStore>(),
|
| base::WrapUnique(test_clock)));
|
| + black_list->Initialize();
|
|
|
| EXPECT_FALSE(black_list->IsLoadedAndAllowed(url_a1, PreviewsType::OFFLINE));
|
| EXPECT_FALSE(black_list->IsLoadedAndAllowed(url_a2, PreviewsType::OFFLINE));
|
| EXPECT_FALSE(black_list->IsLoadedAndAllowed(url_b, PreviewsType::OFFLINE));
|
|
|
| base::RunLoop().RunUntilIdle();
|
|
|
| EXPECT_TRUE(black_list->IsLoadedAndAllowed(url_a1, PreviewsType::OFFLINE));
|
| EXPECT_TRUE(black_list->IsLoadedAndAllowed(url_a2, PreviewsType::OFFLINE));
|
| EXPECT_TRUE(black_list->IsLoadedAndAllowed(url_b, PreviewsType::OFFLINE));
|
| @@ -185,20 +187,21 @@ TEST_F(PreviewsBlackListTest, QueueBehavior) {
|
| base::MessageLoop loop;
|
|
|
| std::vector<bool> test_opt_out{true, false};
|
|
|
| for (auto opt_out : test_opt_out) {
|
| base::Clock* test_clock = new base::SimpleTestClock();
|
|
|
| std::unique_ptr<PreviewsBlackList> black_list(
|
| new PreviewsBlackList(base::MakeUnique<TestPreviewsOptOutStore>(),
|
| base::WrapUnique(test_clock)));
|
| + black_list->Initialize();
|
|
|
| EXPECT_FALSE(black_list->IsLoadedAndAllowed(url, PreviewsType::OFFLINE));
|
| black_list->AddPreviewNavigation(url, opt_out, PreviewsType::OFFLINE);
|
| black_list->AddPreviewNavigation(url, opt_out, PreviewsType::OFFLINE);
|
| EXPECT_FALSE(black_list->IsLoadedAndAllowed(url, PreviewsType::OFFLINE));
|
| base::RunLoop().RunUntilIdle();
|
| EXPECT_EQ(!opt_out,
|
| black_list->IsLoadedAndAllowed(url, PreviewsType::OFFLINE));
|
| }
|
|
|
| @@ -229,20 +232,21 @@ TEST_F(PreviewsBlackListTest, MaxHosts) {
|
| variations::AssociateVariationParams("ClientSidePreviews", "Enabled",
|
| params) &&
|
| base::FieldTrialList::CreateFieldTrial("ClientSidePreviews", "Enabled"));
|
|
|
| base::MessageLoop loop;
|
|
|
| base::SimpleTestClock* test_clock = new base::SimpleTestClock();
|
|
|
| std::unique_ptr<PreviewsBlackList> black_list(
|
| new PreviewsBlackList(nullptr, base::WrapUnique(test_clock)));
|
| + black_list->Initialize();
|
|
|
| black_list->AddPreviewNavigation(url_a, true, PreviewsType::OFFLINE);
|
| test_clock->Advance(base::TimeDelta::FromSeconds(1));
|
| black_list->AddPreviewNavigation(url_b, false, PreviewsType::OFFLINE);
|
| test_clock->Advance(base::TimeDelta::FromSeconds(1));
|
| black_list->AddPreviewNavigation(url_c, false, PreviewsType::OFFLINE);
|
| // url_a should stay in the map, since it has an opt out time.
|
| EXPECT_FALSE(black_list->IsLoadedAndAllowed(url_a, PreviewsType::OFFLINE));
|
| EXPECT_TRUE(black_list->IsLoadedAndAllowed(url_b, PreviewsType::OFFLINE));
|
| EXPECT_TRUE(black_list->IsLoadedAndAllowed(url_c, PreviewsType::OFFLINE));
|
|
|