Re-enable formerly flaky tests for the PrerenderingOffliner.

chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc

 // Copyright 2016 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 "chrome/browser/android/offline_pages/prerendering_offliner.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/run_loop.h"
@@ skipping 239 matching lines @@
 }
 
 void PrerenderingOfflinerTest::OnProgress(const SavePageRequest& request,
                                           int64_t bytes) {}
 
 void PrerenderingOfflinerTest::OnCancel(const SavePageRequest& request) {
   DCHECK(!cancel_callback_called_);
   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);
   EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
                                        progress_callback()));
   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);
   loader()->DisablePrerendering();
   EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
                                        progress_callback()));
   EXPECT_TRUE(loader()->IsIdle());
 }
 
 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,
                           creation_time, kUserRequested);
   profile()->GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, true);
   EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
                                        progress_callback()));
   EXPECT_TRUE(loader()->IsIdle());
 }
 
 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,
                           creation_time, kUserRequested);
   profile()->GetPrefs()->SetInteger(
       prefs::kNetworkPredictionOptions,
       chrome_browser_net::NETWORK_PREDICTION_NEVER);
   EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
                                        progress_callback()));
   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);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status());
 
   loader()->CompleteLoadingAsFailed();
   PumpLoop();
   EXPECT_TRUE(completion_callback_called());
   EXPECT_EQ(Offliner::RequestStatus::LOADING_FAILED, request_status());
   EXPECT_TRUE(loader()->IsIdle());
   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);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   EXPECT_FALSE(loader()->IsIdle());
 
   offliner()->Cancel(cancel_callback());
   PumpLoop();
   EXPECT_TRUE(cancel_callback_called());
@@ skipping 94 matching lines @@
 
   loader()->CompleteLoadingAsCanceled();
   PumpLoop();
   EXPECT_TRUE(completion_callback_called());
   EXPECT_EQ(Offliner::RequestStatus::LOADING_CANCELED, request_status());
   EXPECT_FALSE(loader()->IsLoaded());
   // Note: save still in progress since it does not support canceling.
   EXPECT_TRUE(SaveInProgress());
 }
 
-TEST_F(PrerenderingOfflinerTest,
-       DISABLED_ForegroundTransitionCancelsOnLowEndDevice) {
+TEST_F(PrerenderingOfflinerTest, ForegroundTransitionCancelsOnLowEndDevice) {
   offliner()->SetLowEndDeviceForTesting(true);
 
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(
       kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   EXPECT_FALSE(loader()->IsIdle());
 
   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();
   SavePageRequest request(
       kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   EXPECT_FALSE(loader()->IsIdle());
 
   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());
 }
 
 TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithLowbarAndCompletedTriesMet) {
   offliner()->SetLowEndDeviceForTesting(false);
 
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
@@ skipping 20 matching lines @@
                           kUserRequested);
   request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   loader()->set_is_lowbar_met(true);
   EXPECT_TRUE(offliner()->HandleTimeout(kRequestId));
   EXPECT_TRUE(loader()->start_snapshot_called());
 }
 
 TEST_F(PrerenderingOfflinerTest,
-       DISABLED_HandleTimeoutCompletedTriesMetWithoutLowbarMet) {
+       HandleTimeoutCompletedTriesMetWithoutLowbarMet) {
   offliner()->SetLowEndDeviceForTesting(false);
 
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   loader()->set_is_lowbar_met(false);
   EXPECT_FALSE(offliner()->HandleTimeout(kRequestId));
   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();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   request.set_started_attempt_count(policy()->GetMaxStartedTries() - 1);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   loader()->set_is_lowbar_met(false);
   EXPECT_FALSE(offliner()->HandleTimeout(kRequestId));
   EXPECT_FALSE(loader()->start_snapshot_called());
 }
 
 TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithLowbarAndStartedTriesMet) {
   offliner()->SetLowEndDeviceForTesting(false);
 
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   request.set_started_attempt_count(policy()->GetMaxStartedTries() - 1);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   loader()->set_is_lowbar_met(true);
   EXPECT_TRUE(offliner()->HandleTimeout(kRequestId));
   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();
   SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
                           kUserRequested);
   EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
                                       progress_callback()));
   loader()->set_is_lowbar_met(true);
   EXPECT_FALSE(offliner()->HandleTimeout(kRequestId));
   EXPECT_FALSE(loader()->start_snapshot_called());
@@ skipping 46 matching lines @@
   PumpLoop();
   EXPECT_EQ(Offliner::RequestStatus::SAVED, request_status());
 
   // One extra part should be added if the flag is on.
   content::MHTMLExtraParts* extra_parts =
       content::MHTMLExtraParts::FromWebContents(loader()->web_contents());
   EXPECT_EQ(extra_parts->size(), 1);
 }
 
 }  // namespace offline_pages