| Index: components/offline_pages/background/request_queue_in_memory_store.cc
|
| diff --git a/components/offline_pages/background/request_queue_in_memory_store.cc b/components/offline_pages/background/request_queue_in_memory_store.cc
|
| index 1eb2cab972fb54d8746d3e7ece89bc789fb851f5..7f4ec9bfd79f43d08d0190d9ae8221add4081f2e 100644
|
| --- a/components/offline_pages/background/request_queue_in_memory_store.cc
|
| +++ b/components/offline_pages/background/request_queue_in_memory_store.cc
|
| @@ -99,30 +99,26 @@ void RequestQueueInMemoryStore::RemoveRequests(
|
| void RequestQueueInMemoryStore::ChangeRequestsState(
|
| const std::vector<int64_t>& request_ids,
|
| const SavePageRequest::RequestState new_state,
|
| - const UpdateMultipleRequestsCallback& callback) {
|
| - RequestQueue::UpdateMultipleRequestResults results;
|
| - std::vector<std::unique_ptr<SavePageRequest>> requests;
|
| - RequestQueue::UpdateRequestResult result;
|
| + const UpdateCallback& callback) {
|
| + std::unique_ptr<UpdateRequestsResult> result(
|
| + new UpdateRequestsResult(StoreState::LOADED));
|
| for (int64_t request_id : request_ids) {
|
| + ItemActionStatus status;
|
| auto pair = requests_.find(request_id);
|
| // If we find this request id, modify it, and return the modified request in
|
| // the request list.
|
| if (pair != requests_.end()) {
|
| pair->second.set_request_state(new_state);
|
| - std::unique_ptr<SavePageRequest> request(
|
| - new SavePageRequest(pair->second));
|
| - requests.push_back(std::move(request));
|
| - result = RequestQueue::UpdateRequestResult::SUCCESS;
|
| + result->updated_items.push_back(pair->second);
|
| + status = ItemActionStatus::SUCCESS;
|
| } else {
|
| - result = RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;;
|
| + status = ItemActionStatus::NOT_FOUND;
|
| }
|
| -
|
| - results.push_back(std::make_pair(request_id, result));
|
| + result->item_statuses.push_back(std::make_pair(request_id, status));
|
| }
|
|
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(callback, results, base::Passed(std::move(requests))));
|
| + FROM_HERE, base::Bind(callback, base::Passed(&result)));
|
| }
|
|
|
| void RequestQueueInMemoryStore::Reset(const ResetCallback& callback) {
|
|
|