Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc

Issue 2736843002: Fix the Download Notifications for Offline Pages to indicate bytes loaded. (Closed)
Patch Set: more fixes to more tests. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/offline_pages/prerendering_offliner.cc ('k') | components/offline_pages/core/background/cleanup_task_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2d0a21bbf8392c05fb0e145b64916a38b09257e0..1aebeb4e8f89b1a823799d3e8c858a86e1dd594d 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
+++ b/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
@@ -168,10 +168,14 @@ class PrerenderingOfflinerTest : public testing::Test {
Profile* profile() { return &profile_; }
PrerenderingOffliner* offliner() const { return offliner_.get(); }
- Offliner::CompletionCallback const callback() {
+ Offliner::CompletionCallback const completion_callback() {
return base::Bind(&PrerenderingOfflinerTest::OnCompletion,
base::Unretained(this));
}
+ Offliner::ProgressCallback const progress_callback() {
+ return base::Bind(&PrerenderingOfflinerTest::OnProgress,
+ base::Unretained(this));
+ }
Offliner::CancelCallback const cancel_callback() {
return base::Bind(&PrerenderingOfflinerTest::OnCancel,
base::Unretained(this));
@@ -188,6 +192,7 @@ class PrerenderingOfflinerTest : public testing::Test {
private:
void OnCompletion(const SavePageRequest& request,
Offliner::RequestStatus status);
+ void OnProgress(const SavePageRequest& request, int64_t bytes);
void OnCancel(int64_t offline_id);
content::TestBrowserThreadBundle thread_bundle_;
@@ -229,6 +234,9 @@ void PrerenderingOfflinerTest::OnCompletion(const SavePageRequest& request,
request_status_ = status;
}
+void PrerenderingOfflinerTest::OnProgress(const SavePageRequest& request,
+ int64_t bytes) {}
+
void PrerenderingOfflinerTest::OnCancel(int64_t offline_id) {
DCHECK(!cancel_callback_called_);
cancel_callback_called_ = true;
@@ -238,7 +246,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveBadUrl) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kFileUrl, kClientId, creation_time, kUserRequested);
- EXPECT_FALSE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_TRUE(loader()->IsIdle());
}
@@ -247,7 +256,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSavePrerenderingDisabled) {
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
loader()->DisablePrerendering();
- EXPECT_FALSE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_TRUE(loader()->IsIdle());
}
@@ -258,7 +268,8 @@ TEST_F(PrerenderingOfflinerTest,
SavePageRequest request(kRequestId, kHttpUrl, custom_tabs_client_id,
creation_time, kUserRequested);
profile()->GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, true);
- EXPECT_FALSE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_TRUE(loader()->IsIdle());
}
@@ -271,7 +282,8 @@ TEST_F(PrerenderingOfflinerTest,
profile()->GetPrefs()->SetInteger(
prefs::kNetworkPredictionOptions,
chrome_browser_net::NETWORK_PREDICTION_NEVER);
- EXPECT_FALSE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_TRUE(loader()->IsIdle());
}
@@ -279,7 +291,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadStartedButFails) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_FALSE(loader()->IsIdle());
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status());
@@ -295,7 +308,8 @@ TEST_F(PrerenderingOfflinerTest, CancelWhenLoading) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_FALSE(loader()->IsIdle());
offliner()->Cancel(cancel_callback());
@@ -308,7 +322,8 @@ TEST_F(PrerenderingOfflinerTest, CancelWhenLoaded) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_FALSE(loader()->IsIdle());
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status());
@@ -338,7 +353,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadedButSaveFails) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_FALSE(loader()->IsIdle());
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status());
@@ -360,7 +376,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveSuccessful) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_FALSE(loader()->IsIdle());
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status());
@@ -382,7 +399,8 @@ TEST_F(PrerenderingOfflinerTest, LoadAndSaveLoadedButThenCanceledFromLoader) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_FALSE(loader()->IsIdle());
EXPECT_EQ(Offliner::RequestStatus::UNKNOWN, request_status());
@@ -407,7 +425,8 @@ TEST_F(PrerenderingOfflinerTest, ForegroundTransitionCancelsOnLowEndDevice) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_FALSE(loader()->IsIdle());
offliner()->SetApplicationStateForTesting(
@@ -424,7 +443,8 @@ TEST_F(PrerenderingOfflinerTest, ForegroundTransitionIgnoredOnHighEndDevice) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(
kRequestId, kHttpUrl, kClientId, creation_time, kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
EXPECT_FALSE(loader()->IsIdle());
offliner()->SetApplicationStateForTesting(
@@ -441,7 +461,8 @@ TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithLowbarAndCompletedTriesMet) {
SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
kUserRequested);
request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
loader()->set_is_lowbar_met(true);
EXPECT_TRUE(offliner()->HandleTimeout(request));
EXPECT_TRUE(loader()->start_snapshot_called());
@@ -455,7 +476,8 @@ TEST_F(PrerenderingOfflinerTest,
SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
kUserRequested);
request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
loader()->set_is_lowbar_met(true);
EXPECT_TRUE(offliner()->HandleTimeout(request));
EXPECT_TRUE(loader()->start_snapshot_called());
@@ -469,7 +491,8 @@ TEST_F(PrerenderingOfflinerTest,
SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
kUserRequested);
request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
loader()->set_is_lowbar_met(false);
EXPECT_FALSE(offliner()->HandleTimeout(request));
EXPECT_FALSE(loader()->start_snapshot_called());
@@ -482,7 +505,8 @@ TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithLowbarAndStartedTriesMet) {
SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
kUserRequested);
request.set_started_attempt_count(policy()->GetMaxStartedTries() - 1);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
loader()->set_is_lowbar_met(true);
EXPECT_TRUE(offliner()->HandleTimeout(request));
EXPECT_TRUE(loader()->start_snapshot_called());
@@ -494,7 +518,8 @@ TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithOnlyLowbarMet) {
base::Time creation_time = base::Time::Now();
SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
kUserRequested);
- EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_TRUE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
loader()->set_is_lowbar_met(true);
EXPECT_FALSE(offliner()->HandleTimeout(request));
EXPECT_FALSE(loader()->start_snapshot_called());
« no previous file with comments | « chrome/browser/android/offline_pages/prerendering_offliner.cc ('k') | components/offline_pages/core/background/cleanup_task_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698