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

Unified Diff: components/offline_pages/background/request_coordinator_unittest.cc

Issue 2262423002: Use a vector of smart pointers for callback return type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More compile fixes Created 4 years, 4 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
Index: components/offline_pages/background/request_coordinator_unittest.cc
diff --git a/components/offline_pages/background/request_coordinator_unittest.cc b/components/offline_pages/background/request_coordinator_unittest.cc
index 330e6d7cc60ebfab83270843fd63c39470eb5a19..328c7d40bb6b44bed1e5fa60f707b0d90c05068f 100644
--- a/components/offline_pages/background/request_coordinator_unittest.cc
+++ b/components/offline_pages/background/request_coordinator_unittest.cc
@@ -205,14 +205,15 @@ class RequestCoordinatorTest
// Callback for getting requests.
void GetRequestsDone(RequestQueue::GetRequestsResult result,
- const std::vector<SavePageRequest>& requests);
+ std::vector<std::unique_ptr<SavePageRequest>> requests);
// Callback for removing requests.
void RemoveRequestsDone(
const RequestQueue::UpdateMultipleRequestResults& results);
// Callback for getting request statuses.
- void GetQueuedRequestsDone(const std::vector<SavePageRequest>& requests);
+ void GetQueuedRequestsDone(
+ std::vector<std::unique_ptr<SavePageRequest>> requests);
void SendOfflinerDoneCallback(const SavePageRequest& request,
Offliner::RequestStatus status);
@@ -221,7 +222,7 @@ class RequestCoordinatorTest
return last_get_requests_result_;
}
- const std::vector<SavePageRequest>& last_requests() const {
+ const std::vector<std::unique_ptr<SavePageRequest>>& last_requests() const {
return last_requests_;
}
@@ -265,8 +266,8 @@ class RequestCoordinatorTest
private:
RequestQueue::GetRequestsResult last_get_requests_result_;
- std::vector<SavePageRequest> last_requests_;
RequestQueue::UpdateMultipleRequestResults last_remove_results_;
+ std::vector<std::unique_ptr<SavePageRequest>> last_requests_;
scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
base::ThreadTaskRunnerHandle task_runner_handle_;
std::unique_ptr<RequestCoordinator> coordinator_;
@@ -307,9 +308,9 @@ void RequestCoordinatorTest::PumpLoop() {
void RequestCoordinatorTest::GetRequestsDone(
RequestQueue::GetRequestsResult result,
- const std::vector<SavePageRequest>& requests) {
+ std::vector<std::unique_ptr<SavePageRequest>> requests) {
last_get_requests_result_ = result;
- last_requests_ = requests;
+ last_requests_ = std::move(requests);
}
void RequestCoordinatorTest::RemoveRequestsDone(
@@ -319,8 +320,8 @@ void RequestCoordinatorTest::RemoveRequestsDone(
}
void RequestCoordinatorTest::GetQueuedRequestsDone(
- const std::vector<SavePageRequest>& requests) {
- last_requests_ = requests;
+ std::vector<std::unique_ptr<SavePageRequest>> requests) {
+ last_requests_ = std::move(requests);
waiter_.Signal();
}
@@ -383,8 +384,8 @@ TEST_F(RequestCoordinatorTest, SavePageLater) {
// Check the request queue is as expected.
EXPECT_EQ(1UL, last_requests().size());
- EXPECT_EQ(kUrl1, last_requests()[0].url());
- EXPECT_EQ(kClientId1, last_requests()[0].client_id());
+ EXPECT_EQ(kUrl1, last_requests().at(0)->url());
+ EXPECT_EQ(kClientId1, last_requests().at(0)->client_id());
// Expect that the scheduler got notified.
SchedulerStub* scheduler_stub = reinterpret_cast<SchedulerStub*>(
@@ -539,8 +540,7 @@ TEST_F(RequestCoordinatorTest, OfflinerDoneForegroundCancel) {
// Request no longer in the queue (for single attempt policy).
EXPECT_EQ(1UL, last_requests().size());
// Verify foreground cancel not counted as an attempt after all.
- const SavePageRequest& found_request = last_requests().front();
- EXPECT_EQ(0L, found_request.completed_attempt_count());
+ EXPECT_EQ(0L, last_requests().at(0)->completed_attempt_count());
}
// This tests a StopProcessing call before we have actually started the
@@ -775,8 +775,8 @@ TEST_F(RequestCoordinatorTest, GetAllRequests) {
// Check that the statuses found in the callback match what we expect.
EXPECT_EQ(2UL, last_requests().size());
- EXPECT_EQ(kRequestId1, last_requests().at(0).request_id());
- EXPECT_EQ(kRequestId2, last_requests().at(1).request_id());
+ EXPECT_EQ(kRequestId1, last_requests().at(0)->request_id());
+ EXPECT_EQ(kRequestId2, last_requests().at(1)->request_id());
}
TEST_F(RequestCoordinatorTest, PauseAndResumeObserver) {

Powered by Google App Engine
This is Rietveld 408576698