| Index: components/offline_pages/background/request_queue_store_unittest.cc
|
| diff --git a/components/offline_pages/background/request_queue_store_unittest.cc b/components/offline_pages/background/request_queue_store_unittest.cc
|
| index cfe0bf39e8eadf6839c2b4da9dd96197144ec49f..39a97ea1ec743a0eebe594beaad712b9cd30eef1 100644
|
| --- a/components/offline_pages/background/request_queue_store_unittest.cc
|
| +++ b/components/offline_pages/background/request_queue_store_unittest.cc
|
| @@ -58,9 +58,6 @@ class RequestQueueStoreTestBase : public testing::Test {
|
| void AddOrUpdateDone(UpdateStatus result);
|
| void AddRequestDone(ItemActionStatus status);
|
| void UpdateRequestDone(std::unique_ptr<UpdateRequestsResult> result);
|
| - void UpdateMultipleRequestsDone(
|
| - const RequestQueue::UpdateMultipleRequestResults& results,
|
| - std::vector<std::unique_ptr<SavePageRequest>> requests);
|
| // Callback used for remove requests.
|
| void RemoveDone(const RequestQueue::UpdateMultipleRequestResults& results,
|
| std::vector<std::unique_ptr<SavePageRequest>> requests);
|
| @@ -149,13 +146,6 @@ void RequestQueueStoreTestBase::UpdateRequestDone(
|
| last_update_result_ = std::move(result);
|
| }
|
|
|
| -void RequestQueueStoreTestBase::UpdateMultipleRequestsDone(
|
| - const RequestQueue::UpdateMultipleRequestResults& results,
|
| - std::vector<std::unique_ptr<SavePageRequest>> requests) {
|
| - last_multiple_update_results_ = results;
|
| - last_requests_ = std::move(requests);
|
| -}
|
| -
|
| void RequestQueueStoreTestBase::RemoveDone(
|
| const RequestQueue::UpdateMultipleRequestResults& results,
|
| std::vector<std::unique_ptr<SavePageRequest>> requests) {
|
| @@ -378,75 +368,6 @@ TYPED_TEST(RequestQueueStoreTest, RemoveRequests) {
|
| ASSERT_EQ(0UL, this->last_requests().size());
|
| }
|
|
|
| -TYPED_TEST(RequestQueueStoreTest, PauseAndResumeRequest) {
|
| - std::unique_ptr<RequestQueueStore> store(this->BuildStore());
|
| - base::Time creation_time = base::Time::Now();
|
| -
|
| - // Create request and add it to the queue.
|
| - SavePageRequest request1(kRequestId, kUrl, kClientId, creation_time,
|
| - kUserRequested);
|
| - store->AddRequest(request1,
|
| - base::Bind(&RequestQueueStoreTestBase::AddRequestDone,
|
| - base::Unretained(this)));
|
| - this->PumpLoop();
|
| - this->ClearResults();
|
| -
|
| - // Pause a request.
|
| - std::vector<int64_t> request_ids{kRequestId};
|
| - store->ChangeRequestsState(
|
| - request_ids, SavePageRequest::RequestState::PAUSED,
|
| - base::Bind(&RequestQueueStoreTestBase::UpdateMultipleRequestsDone,
|
| - base::Unretained(this)));
|
| - ASSERT_EQ(LastResult::kNone, this->last_result());
|
| - this->PumpLoop();
|
| -
|
| - // Verify pause succeeded
|
| - ASSERT_EQ(1ul, this->last_multiple_update_results().size());
|
| - ASSERT_EQ(RequestQueue::UpdateRequestResult::SUCCESS,
|
| - this->last_multiple_update_results().at(0).second);
|
| - ASSERT_EQ(kRequestId, this->last_requests().at(0)->request_id());
|
| - this->ClearResults();
|
| -
|
| - // Get the request from the queue to check it out
|
| - store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
|
| - base::Unretained(this)));
|
| - this->PumpLoop();
|
| - ASSERT_EQ(LastResult::kTrue, this->last_result());
|
| - // The request should still be in the queue.
|
| - ASSERT_EQ(1UL, this->last_requests().size());
|
| - // Request 1 should be paused.
|
| - ASSERT_EQ(SavePageRequest::RequestState::PAUSED,
|
| - this->last_requests().at(0)->request_state());
|
| - this->ClearResults();
|
| -
|
| - // Now resume the same request we paused.
|
| - store->ChangeRequestsState(
|
| - request_ids, SavePageRequest::RequestState::AVAILABLE,
|
| - base::Bind(&RequestQueueStoreTestBase::UpdateMultipleRequestsDone,
|
| - base::Unretained(this)));
|
| - ASSERT_EQ(LastResult::kNone, this->last_result());
|
| - this->PumpLoop();
|
| -
|
| - // Verify resume succeeded.
|
| - ASSERT_EQ(1ul, this->last_multiple_update_results().size());
|
| - ASSERT_EQ(RequestQueue::UpdateRequestResult::SUCCESS,
|
| - this->last_multiple_update_results().at(0).second);
|
| - ASSERT_EQ(kRequestId, this->last_requests().at(0)->request_id());
|
| - this->ClearResults();
|
| -
|
| - // Get the request from the queue to check it out
|
| - store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
|
| - base::Unretained(this)));
|
| - this->PumpLoop();
|
| - ASSERT_EQ(LastResult::kTrue, this->last_result());
|
| - // The request should still be in the queue.
|
| - ASSERT_EQ(1UL, this->last_requests().size());
|
| - // Request 1 should be paused.
|
| - ASSERT_EQ(SavePageRequest::RequestState::AVAILABLE,
|
| - this->last_requests().at(0)->request_state());
|
| - this->ClearResults();
|
| -}
|
| -
|
| TYPED_TEST(RequestQueueStoreTest, ResetStore) {
|
| std::unique_ptr<RequestQueueStore> store(this->BuildStore());
|
| base::Time creation_time = base::Time::Now();
|
|
|