| Index: chrome/browser/offline_pages/background_loader_offliner_unittest.cc
|
| diff --git a/chrome/browser/offline_pages/background_loader_offliner_unittest.cc b/chrome/browser/offline_pages/background_loader_offliner_unittest.cc
|
| index d151b605c20e7a29e792735d954398e8ca541646..56c7a4426d5ed1348913cf26f833df597a2bde0a 100644
|
| --- a/chrome/browser/offline_pages/background_loader_offliner_unittest.cc
|
| +++ b/chrome/browser/offline_pages/background_loader_offliner_unittest.cc
|
| @@ -236,6 +236,15 @@ void BackgroundLoaderOfflinerTest::OnCancel(const SavePageRequest& request) {
|
| cancel_callback_called_ = true;
|
| }
|
|
|
| +// Two tests crash roughly 20% of runs on Android. http://crbug.com/722556.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_FailsOnErrorPage DISABLED_FailsOnErrorPage
|
| +#define MAYBE_NoNextOnInternetDisconnected DISABLED_NoNextOnInternetDisconnected
|
| +#else
|
| +#define MAYBE_FailsOnErrorPage FailsOnErrorPage
|
| +#define MAYBE_NoNextOnInternetDisconnected NoNextOnInternetDisconnected
|
| +#endif
|
| +
|
| TEST_F(BackgroundLoaderOfflinerTest,
|
| LoadAndSaveBlockThirdPartyCookiesForCustomTabs) {
|
| base::Time creation_time = base::Time::Now();
|
| @@ -464,7 +473,7 @@ TEST_F(BackgroundLoaderOfflinerTest, ReturnsOnWebContentsDestroyed) {
|
| EXPECT_EQ(Offliner::RequestStatus::LOADING_FAILED, request_status());
|
| }
|
|
|
| -TEST_F(BackgroundLoaderOfflinerTest, FailsOnErrorPage) {
|
| +TEST_F(BackgroundLoaderOfflinerTest, MAYBE_FailsOnErrorPage) {
|
| base::Time creation_time = base::Time::Now();
|
| SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
|
| kUserRequested);
|
| @@ -489,7 +498,7 @@ TEST_F(BackgroundLoaderOfflinerTest, FailsOnErrorPage) {
|
| EXPECT_EQ(Offliner::RequestStatus::LOADING_FAILED, request_status());
|
| }
|
|
|
| -TEST_F(BackgroundLoaderOfflinerTest, NoNextOnInternetDisconnected) {
|
| +TEST_F(BackgroundLoaderOfflinerTest, MAYBE_NoNextOnInternetDisconnected) {
|
| base::Time creation_time = base::Time::Now();
|
| SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
|
| kUserRequested);
|
|
|