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 f2a4b7853c6d3e1cf24083e720e94cb873d81ade..a49e726bd598aa1c998c1cc2704d684d9255491b 100644 |
--- a/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc |
+++ b/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc |
@@ -25,6 +25,7 @@ const int64_t kRequestId = 7; |
const GURL kHttpUrl("http://tunafish.com"); |
const GURL kFileUrl("file://sailfish.png"); |
const ClientId kClientId("AsyncLoading", "88"); |
+const bool kUserRequested = true; |
// Mock Loader for testing the Offliner calls. |
class MockPrerenderingLoader : public PrerenderingLoader { |
@@ -198,14 +199,16 @@ void PrerenderingOfflinerTest::OnCompletion(const SavePageRequest& request, |
TEST_F(PrerenderingOfflinerTest, LoadAndSaveBadUrl) { |
base::Time creation_time = base::Time::Now(); |
- SavePageRequest request(kRequestId, kFileUrl, kClientId, creation_time); |
+ SavePageRequest request( |
+ kRequestId, kFileUrl, kClientId, creation_time, kUserRequested); |
EXPECT_FALSE(offliner()->LoadAndSave(request, callback())); |
EXPECT_TRUE(loader()->IsIdle()); |
} |
TEST_F(PrerenderingOfflinerTest, LoadAndSavePrerenderingDisabled) { |
base::Time creation_time = base::Time::Now(); |
- SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time); |
+ SavePageRequest request( |
+ kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested); |
loader()->DisablePrerendering(); |
EXPECT_FALSE(offliner()->LoadAndSave(request, callback())); |
EXPECT_TRUE(loader()->IsIdle()); |
@@ -213,7 +216,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSavePrerenderingDisabled) { |
TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadStartedButFails) { |
base::Time creation_time = base::Time::Now(); |
- SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time); |
+ SavePageRequest request( |
+ kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested); |
EXPECT_TRUE(offliner()->LoadAndSave(request, callback())); |
EXPECT_FALSE(loader()->IsIdle()); |
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status()); |
@@ -228,7 +232,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadStartedButFails) { |
TEST_F(PrerenderingOfflinerTest, CancelWhenLoading) { |
base::Time creation_time = base::Time::Now(); |
- SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time); |
+ SavePageRequest request( |
+ kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested); |
EXPECT_TRUE(offliner()->LoadAndSave(request, callback())); |
EXPECT_FALSE(loader()->IsIdle()); |
@@ -238,7 +243,8 @@ TEST_F(PrerenderingOfflinerTest, CancelWhenLoading) { |
TEST_F(PrerenderingOfflinerTest, CancelWhenLoaded) { |
base::Time creation_time = base::Time::Now(); |
- SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time); |
+ SavePageRequest request( |
+ kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested); |
EXPECT_TRUE(offliner()->LoadAndSave(request, callback())); |
EXPECT_FALSE(loader()->IsIdle()); |
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status()); |
@@ -266,7 +272,8 @@ TEST_F(PrerenderingOfflinerTest, CancelWhenLoaded) { |
TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadedButSaveFails) { |
base::Time creation_time = base::Time::Now(); |
- SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time); |
+ SavePageRequest request( |
+ kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested); |
EXPECT_TRUE(offliner()->LoadAndSave(request, callback())); |
EXPECT_FALSE(loader()->IsIdle()); |
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status()); |
@@ -287,7 +294,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadedButSaveFails) { |
TEST_F(PrerenderingOfflinerTest, LoadAndSaveSuccessful) { |
base::Time creation_time = base::Time::Now(); |
- SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time); |
+ SavePageRequest request( |
+ kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested); |
EXPECT_TRUE(offliner()->LoadAndSave(request, callback())); |
EXPECT_FALSE(loader()->IsIdle()); |
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status()); |
@@ -308,7 +316,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveSuccessful) { |
TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadedButThenCanceledFromLoader) { |
base::Time creation_time = base::Time::Now(); |
- SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time); |
+ SavePageRequest request( |
+ kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested); |
EXPECT_TRUE(offliner()->LoadAndSave(request, callback())); |
EXPECT_FALSE(loader()->IsIdle()); |
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status()); |