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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/offline_pages/background_loader_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/background_loader_offliner.cc ('k') | chrome/browser/android/offline_pages/downloads/offline_page_notification_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/offline_pages/background_loader_offliner_unittest.cc
diff --git a/chrome/browser/android/offline_pages/background_loader_offliner_unittest.cc b/chrome/browser/android/offline_pages/background_loader_offliner_unittest.cc
index 0b4e691c97b8ea63961c5ce48c741295bc61244c..6cc39f27e3a1155b0942afa8e90bd97e3a90d094 100644
--- a/chrome/browser/android/offline_pages/background_loader_offliner_unittest.cc
+++ b/chrome/browser/android/offline_pages/background_loader_offliner_unittest.cc
@@ -126,10 +126,14 @@ class BackgroundLoaderOfflinerTest : public testing::Test {
void SetUp() override;
TestBackgroundLoaderOffliner* offliner() const { return offliner_.get(); }
- Offliner::CompletionCallback const callback() {
+ Offliner::CompletionCallback const completion_callback() {
return base::Bind(&BackgroundLoaderOfflinerTest::OnCompletion,
base::Unretained(this));
}
+ Offliner::ProgressCallback const progress_callback() {
+ return base::Bind(&BackgroundLoaderOfflinerTest::OnProgress,
+ base::Unretained(this));
+ }
Offliner::CancelCallback const cancel_callback() {
return base::Bind(&BackgroundLoaderOfflinerTest::OnCancel,
base::Unretained(this));
@@ -153,6 +157,7 @@ class BackgroundLoaderOfflinerTest : 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_;
TestingProfile profile_;
@@ -188,6 +193,9 @@ void BackgroundLoaderOfflinerTest::OnCompletion(
request_status_ = status;
}
+void BackgroundLoaderOfflinerTest::OnProgress(const SavePageRequest& request,
+ int64_t bytes) {}
+
void BackgroundLoaderOfflinerTest::OnCancel(int64_t offline_id) {
DCHECK(!cancel_callback_called_);
cancel_callback_called_ = true;
@@ -201,7 +209,8 @@ TEST_F(BackgroundLoaderOfflinerTest,
creation_time, kUserRequested);
profile()->GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, true);
- EXPECT_FALSE(offliner()->LoadAndSave(request, callback()));
+ EXPECT_FALSE(offliner()->LoadAndSave(request, completion_callback(),
+ progress_callback()));
histograms().ExpectBucketCount(
"OfflinePages.Background.CctApiDisableStatus",
static_cast<int>(OfflinePagesCctApiPrerenderAllowedStatus::
@@ -221,7 +230,8 @@ TEST_F(BackgroundLoaderOfflinerTest,
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()));
histograms().ExpectBucketCount(
"OfflinePages.Background.CctApiDisableStatus",
static_cast<int>(OfflinePagesCctApiPrerenderAllowedStatus::
@@ -238,7 +248,8 @@ TEST_F(BackgroundLoaderOfflinerTest, LoadAndSaveStartsLoading) {
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_TRUE(offliner()->is_loading());
EXPECT_FALSE(SaveInProgress());
EXPECT_FALSE(completion_callback_called());
@@ -249,7 +260,8 @@ TEST_F(BackgroundLoaderOfflinerTest, CompleteLoadingInitiatesSave) {
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()));
CompleteLoading();
PumpLoop();
EXPECT_FALSE(completion_callback_called());
@@ -261,7 +273,8 @@ TEST_F(BackgroundLoaderOfflinerTest, 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()));
offliner()->Cancel(cancel_callback());
PumpLoop();
EXPECT_TRUE(cancel_callback_called());
@@ -272,7 +285,8 @@ TEST_F(BackgroundLoaderOfflinerTest, 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()));
CompleteLoading();
PumpLoop();
offliner()->Cancel(cancel_callback());
@@ -291,7 +305,8 @@ TEST_F(BackgroundLoaderOfflinerTest, LoadedButSaveFails) {
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()));
CompleteLoading();
PumpLoop();
@@ -308,7 +323,8 @@ TEST_F(BackgroundLoaderOfflinerTest, LoadAndSaveSuccess) {
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()));
CompleteLoading();
PumpLoop();
@@ -325,14 +341,16 @@ TEST_F(BackgroundLoaderOfflinerTest, FailsOnInvalidURL) {
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()));
}
TEST_F(BackgroundLoaderOfflinerTest, ReturnsOnRenderCrash) {
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()));
offliner()->RenderProcessGone(
base::TerminationStatus::TERMINATION_STATUS_PROCESS_CRASHED);
@@ -344,7 +362,8 @@ TEST_F(BackgroundLoaderOfflinerTest, ReturnsOnRenderKilled) {
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()));
offliner()->RenderProcessGone(
base::TerminationStatus::TERMINATION_STATUS_PROCESS_WAS_KILLED);
@@ -356,7 +375,8 @@ TEST_F(BackgroundLoaderOfflinerTest, ReturnsOnWebContentsDestroyed) {
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()));
offliner()->WebContentsDestroyed();
EXPECT_TRUE(completion_callback_called());
@@ -367,7 +387,8 @@ TEST_F(BackgroundLoaderOfflinerTest, FailsOnErrorPage) {
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()));
// Create handle with net error code.
// Called after calling LoadAndSave so we have web_contents to work with.
@@ -390,7 +411,8 @@ TEST_F(BackgroundLoaderOfflinerTest, NoNextOnInternetDisconnected) {
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()));
// Create handle with net error code.
// Called after calling LoadAndSave so we have web_contents to work with.
@@ -413,7 +435,8 @@ TEST_F(BackgroundLoaderOfflinerTest, OnlySavesOnceOnMultipleLoads) {
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()));
// First load
CompleteLoading();
// Second load
« no previous file with comments | « chrome/browser/android/offline_pages/background_loader_offliner.cc ('k') | chrome/browser/android/offline_pages/downloads/offline_page_notification_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698