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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2742833004: Fix the Download Notifications for Offline Pages to indicate bytes loaded. (Closed)
Patch Set: 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 4018ad481a6aa6e0fc26cff7abada67826c04dac..2efe125e4fbd5718abd4a73f062e6bf39f763906 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));
+ }
Profile* profile() { return &profile_; }
bool completion_callback_called() { return completion_callback_called_; }
Offliner::RequestStatus request_status() { return request_status_; }
@@ -148,6 +152,7 @@ class BackgroundLoaderOfflinerTest : public testing::Test {
private:
void OnCompletion(const SavePageRequest& request,
Offliner::RequestStatus status);
+ void OnProgress(const SavePageRequest& request, int64_t bytes);
content::TestBrowserThreadBundle thread_bundle_;
TestingProfile profile_;
std::unique_ptr<TestBackgroundLoaderOffliner> offliner_;
@@ -180,6 +185,9 @@ void BackgroundLoaderOfflinerTest::OnCompletion(
request_status_ = status;
}
+void BackgroundLoaderOfflinerTest::OnProgress(const SavePageRequest& request,
+ int64_t bytes) {}
+
TEST_F(BackgroundLoaderOfflinerTest,
LoadAndSaveBlockThirdPartyCookiesForCustomTabs) {
base::Time creation_time = base::Time::Now();
@@ -188,7 +196,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::
@@ -208,7 +217,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::
@@ -225,7 +235,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());
@@ -236,7 +247,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());
@@ -248,7 +260,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();
EXPECT_FALSE(offliner()->is_loading()); // Offliner reset.
}
@@ -257,7 +270,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();
@@ -274,7 +288,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();
@@ -291,7 +306,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();
@@ -308,14 +324,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);
@@ -327,7 +345,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);
@@ -339,7 +358,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());
@@ -350,7 +370,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.
@@ -373,7 +394,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