Index: chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc |
diff --git a/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc b/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc |
index cc4073391d75fcc2f47f993882d30586a8e0cfca..cf737380bd1db80a85394ababa19e7c8a162d802 100644 |
--- a/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc |
+++ b/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc |
@@ -213,6 +213,7 @@ TEST_F(RecentTabHelperTest, SimpleCapture) { |
NavigateAndCommit(kTestPageUrl); |
EXPECT_FALSE(recent_tab_helper()->is_page_ready_for_snapshot()); |
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame(); |
+ FastForwardSnapshotController(); |
RunUntilIdle(); |
EXPECT_TRUE(recent_tab_helper()->is_page_ready_for_snapshot()); |
EXPECT_TRUE(model()->is_loaded()); |
@@ -228,6 +229,7 @@ TEST_F(RecentTabHelperTest, NoTabIdNoCapture) { |
NavigateAndCommit(kTestPageUrl); |
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame(); |
+ FastForwardSnapshotController(); |
RunUntilIdle(); |
EXPECT_TRUE(model()->is_loaded()); |
GetAllPages(); |
@@ -252,8 +254,10 @@ TEST_F(RecentTabHelperTest, TwoCapturesSameUrl) { |
EXPECT_EQ(1U, all_pages().size()); |
EXPECT_EQ(kTestPageUrl, all_pages()[0].url); |
- // Triggers snapshot immediately; |
+ // Triggers snapshot after a time delay. |
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame(); |
+ // Move the snapshot controller's time forward so it gets past timeouts. |
+ FastForwardSnapshotController(); |
RunUntilIdle(); |
EXPECT_EQ(2U, model_changed_count()); |
EXPECT_EQ(1U, model_removed_count()); |
@@ -281,8 +285,10 @@ TEST_F(RecentTabHelperTest, TwoCapturesDifferentUrls) { |
EXPECT_EQ(kTestPageUrl, all_pages()[0].url); |
NavigateAndCommit(kTestPageUrlOther); |
- // Triggers snapshot immediately; |
+ // Triggers snapshot after a time delay. |
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame(); |
+ // Move the snapshot controller's time forward so it gets past timeouts. |
+ FastForwardSnapshotController(); |
RunUntilIdle(); |
EXPECT_EQ(2U, model_changed_count()); |
EXPECT_EQ(1U, model_removed_count()); |
@@ -295,6 +301,7 @@ TEST_F(RecentTabHelperTest, TwoCapturesDifferentUrls) { |
TEST_F(RecentTabHelperTest, NoCaptureOnErrorPage) { |
FailLoad(kTestPageUrl); |
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame(); |
+ FastForwardSnapshotController(); |
RunUntilIdle(); |
EXPECT_TRUE(model()->is_loaded()); |
GetAllPages(); |
@@ -306,6 +313,7 @@ TEST_F(RecentTabHelperTest, FeatureNotEnabled) { |
scoped_feature_list.Init(); |
NavigateAndCommit(kTestPageUrl); |
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame(); |
+ FastForwardSnapshotController(); |
RunUntilIdle(); |
EXPECT_TRUE(model()->is_loaded()); |
GetAllPages(); |