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

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

Issue 2373933003: [Offline pages] Updating RequestQueue::RemoveRequests to use a TaskQueue (Closed)
Patch Set: Addressing final feedback Created 4 years, 2 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_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 2491f8f30a3c3dbcaf7fc00aee58686320863391..e2d79ed2e8f5fd63e43bd07fa6e349a26c8bb2b0 100644
--- a/components/offline_pages/background/request_queue_in_memory_store.cc
+++ b/components/offline_pages/background/request_queue_in_memory_store.cc
@@ -69,31 +69,27 @@ void RequestQueueInMemoryStore::UpdateRequests(
void RequestQueueInMemoryStore::RemoveRequests(
const std::vector<int64_t>& request_ids,
- const RemoveCallback& callback) {
- RequestQueue::UpdateMultipleRequestResults results;
- RequestQueue::UpdateRequestResult result;
- std::vector<std::unique_ptr<SavePageRequest>> requests;
- RequestsMap::iterator iter;
+ const UpdateCallback& callback) {
+ std::unique_ptr<UpdateRequestsResult> result(
+ new UpdateRequestsResult(StoreState::LOADED));
+ ItemActionStatus status;
// If we find a request, mark it as succeeded, and put it in the request list.
// Otherwise mark it as failed.
for (auto request_id : request_ids) {
- iter = requests_.find(request_id);
+ RequestsMap::iterator iter = requests_.find(request_id);
if (iter != requests_.end()) {
- std::unique_ptr<SavePageRequest> request(
- new SavePageRequest(iter->second));
+ status = ItemActionStatus::SUCCESS;
+ result->updated_items.push_back(iter->second);
requests_.erase(iter);
- result = RequestQueue::UpdateRequestResult::SUCCESS;
- requests.push_back(std::move(request));
} 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) {

Powered by Google App Engine
This is Rietveld 408576698