| 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 8ff60b5376b9838e92e4f7528ce8900dd650fb07..e934e3e3f316ec1db028f9b2a2f3ae1881cb89bc 100644
|
| --- a/chrome/browser/android/offline_pages/background_loader_offliner_unittest.cc
|
| +++ b/chrome/browser/android/offline_pages/background_loader_offliner_unittest.cc
|
| @@ -163,7 +163,7 @@ class BackgroundLoaderOfflinerTest : public testing::Test {
|
| void OnCompletion(const SavePageRequest& request,
|
| Offliner::RequestStatus status);
|
| void OnProgress(const SavePageRequest& request, int64_t bytes);
|
| - void OnCancel(int64_t offline_id);
|
| + void OnCancel(const SavePageRequest& request);
|
| content::TestBrowserThreadBundle thread_bundle_;
|
| TestingProfile profile_;
|
| std::unique_ptr<OfflinerPolicy> policy_;
|
| @@ -208,7 +208,7 @@ void BackgroundLoaderOfflinerTest::OnProgress(const SavePageRequest& request,
|
| progress_ = bytes;
|
| }
|
|
|
| -void BackgroundLoaderOfflinerTest::OnCancel(int64_t offline_id) {
|
| +void BackgroundLoaderOfflinerTest::OnCancel(const SavePageRequest& request) {
|
| DCHECK(!cancel_callback_called_);
|
| cancel_callback_called_ = true;
|
| }
|
| @@ -501,7 +501,7 @@ TEST_F(BackgroundLoaderOfflinerTest, HandleTimeoutWithLowBarStartedTriesMet) {
|
| // Sets lowbar.
|
| offliner()->DocumentAvailableInMainFrame();
|
| // Timeout
|
| - EXPECT_TRUE(offliner()->HandleTimeout(request));
|
| + EXPECT_TRUE(offliner()->HandleTimeout(kRequestId));
|
| EXPECT_TRUE(SaveInProgress());
|
| model()->CompleteSavingAsSuccess();
|
| PumpLoop();
|
| @@ -518,7 +518,7 @@ TEST_F(BackgroundLoaderOfflinerTest, HandleTimeoutWithLowBarCompletedTriesMet) {
|
| // Sets lowbar.
|
| offliner()->DocumentAvailableInMainFrame();
|
| // Timeout
|
| - EXPECT_TRUE(offliner()->HandleTimeout(request));
|
| + EXPECT_TRUE(offliner()->HandleTimeout(kRequestId));
|
| EXPECT_TRUE(SaveInProgress());
|
| model()->CompleteSavingAsSuccess();
|
| PumpLoop();
|
| @@ -533,7 +533,7 @@ TEST_F(BackgroundLoaderOfflinerTest, HandleTimeoutWithNoLowBarStartedTriesMet) {
|
| progress_callback()));
|
| request.set_started_attempt_count(policy()->GetMaxStartedTries() - 1);
|
| // Timeout
|
| - EXPECT_FALSE(offliner()->HandleTimeout(request));
|
| + EXPECT_FALSE(offliner()->HandleTimeout(kRequestId));
|
| EXPECT_FALSE(SaveInProgress());
|
| }
|
|
|
| @@ -546,7 +546,7 @@ TEST_F(BackgroundLoaderOfflinerTest,
|
| progress_callback()));
|
| request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
|
| // Timeout
|
| - EXPECT_FALSE(offliner()->HandleTimeout(request));
|
| + EXPECT_FALSE(offliner()->HandleTimeout(kRequestId));
|
| EXPECT_FALSE(SaveInProgress());
|
| }
|
|
|
| @@ -559,7 +559,7 @@ TEST_F(BackgroundLoaderOfflinerTest, HandleTimeoutWithLowBarNoRetryLimit) {
|
| // Sets lowbar.
|
| offliner()->DocumentAvailableInMainFrame();
|
| // Timeout
|
| - EXPECT_FALSE(offliner()->HandleTimeout(request));
|
| + EXPECT_FALSE(offliner()->HandleTimeout(kRequestId));
|
| EXPECT_FALSE(SaveInProgress());
|
| }
|
|
|
|
|