Re-enable formerly flaky tests for the PrerenderingOffliner.

chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc

Index: chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
diff --git a/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc b/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
index cc95fccc16b69f6cfbcc39657cd1977aa6a82638..5a3410576468e07b4845e7e81e360108fb4516e7 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
+++ b/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
@@ -257,7 +257,7 @@ void PrerenderingOfflinerTest::OnCancel(const SavePageRequest& request) {
   cancel_callback_called_ = true;
 }
 
-TEST_F(PrerenderingOfflinerTest, DISABLED_LoadAndSaveBadUrl) {
+TEST_F(PrerenderingOfflinerTest, LoadAndSaveBadUrl) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(
       kRequestId, kFileUrl, kClientId, creation_time, kUserRequested);
@@ -266,7 +266,7 @@ TEST_F(PrerenderingOfflinerTest, DISABLED_LoadAndSaveBadUrl) {
   EXPECT_TRUE(loader()->IsIdle());
 }
 
-TEST_F(PrerenderingOfflinerTest, DISABLED_LoadAndSavePrerenderingDisabled) {
+TEST_F(PrerenderingOfflinerTest, LoadAndSavePrerenderingDisabled) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(
       kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
@@ -277,7 +277,7 @@ TEST_F(PrerenderingOfflinerTest, DISABLED_LoadAndSavePrerenderingDisabled) {
 }
 
 TEST_F(PrerenderingOfflinerTest,
-       DISABLED_LoadAndSaveBlockThirdPartyCookiesForCustomTabs) {
+       LoadAndSaveBlockThirdPartyCookiesForCustomTabs) {
   base::Time creation_time = base::Time::Now();
   ClientId custom_tabs_client_id("custom_tabs", "88");
   SavePageRequest request(kRequestId, kHttpUrl, custom_tabs_client_id,
@@ -289,7 +289,7 @@ TEST_F(PrerenderingOfflinerTest,
 }
 
 TEST_F(PrerenderingOfflinerTest,
-       DISABLED_LoadAndSaveBlockOnDisabledPrerendererForCustomTabs) {
+       LoadAndSaveBlockOnDisabledPrerendererForCustomTabs) {
   base::Time creation_time = base::Time::Now();
   ClientId custom_tabs_client_id("custom_tabs", "88");
   SavePageRequest request(kRequestId, kHttpUrl, custom_tabs_client_id,
@@ -302,7 +302,7 @@ TEST_F(PrerenderingOfflinerTest,
   EXPECT_TRUE(loader()->IsIdle());
 }
 
-TEST_F(PrerenderingOfflinerTest, DISABLED_LoadAndSaveLoadStartedButFails) {
+TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadStartedButFails) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(
       kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
@@ -319,7 +319,7 @@ TEST_F(PrerenderingOfflinerTest, DISABLED_LoadAndSaveLoadStartedButFails) {
   EXPECT_FALSE(SaveInProgress());
 }
 
-TEST_F(PrerenderingOfflinerTest, DISABLED_CancelWhenLoading) {
+TEST_F(PrerenderingOfflinerTest, CancelWhenLoading) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(
       kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
@@ -434,8 +434,7 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadedButThenCanceledFromLoader) {
   EXPECT_TRUE(SaveInProgress());
 }
 
-TEST_F(PrerenderingOfflinerTest,
-       DISABLED_ForegroundTransitionCancelsOnLowEndDevice) {
+TEST_F(PrerenderingOfflinerTest, ForegroundTransitionCancelsOnLowEndDevice) {
   offliner()->SetLowEndDeviceForTesting(true);
 
   base::Time creation_time = base::Time::Now();
@@ -448,14 +447,15 @@ TEST_F(PrerenderingOfflinerTest,
   offliner()->SetApplicationStateForTesting(
       base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES);
 
+  // Wait until callback arrives before checking postconditions.

[dewittj, 2017/04/27 17:30:52]

Which callback?

[Pete Williamson, 2017/04/27 18:09:19]

Done.

+  PumpLoop();
+
   // Loading canceled on low-end device.
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_EQ(Offliner::RequestStatus::FOREGROUND_CANCELED, request_status());
 }
 
-// TODO(crbug.com/712941): Flaky test.
-TEST_F(PrerenderingOfflinerTest,
-       DISABLED_ForegroundTransitionIgnoredOnHighEndDevice) {
+TEST_F(PrerenderingOfflinerTest, ForegroundTransitionIgnoredOnHighEndDevice) {
   offliner()->SetLowEndDeviceForTesting(false);
 
   base::Time creation_time = base::Time::Now();
@@ -468,6 +468,9 @@ TEST_F(PrerenderingOfflinerTest,
   offliner()->SetApplicationStateForTesting(
       base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES);
 
+  // Wait until callback arrives before checking postconditions.

[dewittj, 2017/04/27 17:30:52]

same

[Pete Williamson, 2017/04/27 18:09:19]

Done.

+  PumpLoop();
+
   // Loader still loading since not low-end device.
   EXPECT_FALSE(loader()->IsIdle());
 }
@@ -508,7 +511,7 @@ TEST_F(PrerenderingOfflinerTest,
 }
 
 TEST_F(PrerenderingOfflinerTest,
-       DISABLED_HandleTimeoutCompletedTriesMetWithoutLowbarMet) {
+       HandleTimeoutCompletedTriesMetWithoutLowbarMet) {
   offliner()->SetLowEndDeviceForTesting(false);
 
   base::Time creation_time = base::Time::Now();
@@ -522,8 +525,7 @@ TEST_F(PrerenderingOfflinerTest,
   EXPECT_FALSE(loader()->start_snapshot_called());
 }
 
-TEST_F(PrerenderingOfflinerTest,
-       DISABLED_HandleTimeoutStartedTriesMetWithoutLowbarMet) {
+TEST_F(PrerenderingOfflinerTest, HandleTimeoutStartedTriesMetWithoutLowbarMet) {
   offliner()->SetLowEndDeviceForTesting(false);
 
   base::Time creation_time = base::Time::Now();
@@ -551,7 +553,7 @@ TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithLowbarAndStartedTriesMet) {
   EXPECT_TRUE(loader()->start_snapshot_called());
 }
 
-TEST_F(PrerenderingOfflinerTest, DISABLED_HandleTimeoutWithOnlyLowbarMet) {
+TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithOnlyLowbarMet) {
   offliner()->SetLowEndDeviceForTesting(false);
 
   base::Time creation_time = base::Time::Now();