Commit 2e302933 authored by Robert Ogden's avatar Robert Ogden Committed by Commit Bot

Fix flaky PreviewsOfflineHelperTest

Offline Page's init on Android is making this flaky. This changes the
test to pass a null browser context so that doesn't happen.

Bug: 960773
Change-Id: Ife6b78321bd72ada6c4ed7b9c70e12472fb2e5f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1603842Reviewed-by: default avatarRyan Sturm <ryansturm@chromium.org>
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658336}
parent 2eb340be
...@@ -25,8 +25,8 @@ class PreviewsOfflineHelperTest : public ChromeRenderViewHostTestHarness { ...@@ -25,8 +25,8 @@ class PreviewsOfflineHelperTest : public ChromeRenderViewHostTestHarness {
ChromeRenderViewHostTestHarness::TearDown(); ChromeRenderViewHostTestHarness::TearDown();
} }
PreviewsOfflineHelper* NewHelper() { PreviewsOfflineHelper* NewHelper(content::BrowserContext* browser_context) {
helper_.reset(new PreviewsOfflineHelper(browser_context())); helper_.reset(new PreviewsOfflineHelper(browser_context));
return helper_.get(); return helper_.get();
} }
...@@ -188,7 +188,7 @@ TEST_F(PreviewsOfflineHelperTest, TestAddRemovePages) { ...@@ -188,7 +188,7 @@ TEST_F(PreviewsOfflineHelperTest, TestAddRemovePages) {
TestingPrefServiceSimple test_prefs; TestingPrefServiceSimple test_prefs;
PreviewsOfflineHelper::RegisterProfilePrefs(test_prefs.registry()); PreviewsOfflineHelper::RegisterProfilePrefs(test_prefs.registry());
PreviewsOfflineHelper* helper = NewHelper(); PreviewsOfflineHelper* helper = NewHelper(nullptr);
helper->SetPrefServiceForTesting(&test_prefs); helper->SetPrefServiceForTesting(&test_prefs);
// The tests above rely on this ordering. // The tests above rely on this ordering.
...@@ -242,7 +242,7 @@ TEST_F(PreviewsOfflineHelperTest, TestMaxPrefSize) { ...@@ -242,7 +242,7 @@ TEST_F(PreviewsOfflineHelperTest, TestMaxPrefSize) {
previews::features::kOfflinePreviewsFalsePositivePrevention, previews::features::kOfflinePreviewsFalsePositivePrevention,
{{"max_pref_entries", "1"}}); {{"max_pref_entries", "1"}});
PreviewsOfflineHelper* helper = NewHelper(); PreviewsOfflineHelper* helper = NewHelper(nullptr);
base::Time first = base::Time::Now(); base::Time first = base::Time::Now();
base::Time second = first + base::TimeDelta::FromMinutes(1); base::Time second = first + base::TimeDelta::FromMinutes(1);
...@@ -267,7 +267,7 @@ TEST_F(PreviewsOfflineHelperTest, TestUpdateAllPrefEntries) { ...@@ -267,7 +267,7 @@ TEST_F(PreviewsOfflineHelperTest, TestUpdateAllPrefEntries) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
PreviewsOfflineHelper* helper = NewHelper(); PreviewsOfflineHelper* helper = NewHelper(nullptr);
base::Time now = base::Time::Now(); base::Time now = base::Time::Now();
base::Time expired = now - base::Time expired = now -
previews::params::OfflinePreviewFreshnessDuration() - previews::params::OfflinePreviewFreshnessDuration() -
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment