| 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 32219a91616eef459ea08ab4fb7116258f781355..07372468c41177159b378ffc155d19d9981f4d70 100644
|
| --- a/components/offline_pages/background/request_queue_in_memory_store.cc
|
| +++ b/components/offline_pages/background/request_queue_in_memory_store.cc
|
| @@ -4,8 +4,6 @@
|
|
|
| #include "components/offline_pages/background/request_queue_in_memory_store.h"
|
|
|
| -#include <set>
|
| -
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| @@ -40,37 +38,22 @@ void RequestQueueInMemoryStore::AddOrUpdateRequest(
|
| void RequestQueueInMemoryStore::RemoveRequests(
|
| const std::vector<int64_t>& request_ids,
|
| const RemoveCallback& callback) {
|
| - int count = 0;
|
| + RequestQueue::UpdateMultipleRequestResults results;
|
| + RequestQueue::UpdateRequestResult result;
|
| RequestsMap::iterator iter;
|
| for (auto request_id : request_ids) {
|
| iter = requests_.find(request_id);
|
| if (iter != requests_.end()) {
|
| requests_.erase(iter);
|
| - ++count;
|
| - }
|
| - }
|
| -
|
| - base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| - FROM_HERE, base::Bind(callback, true, count));
|
| -}
|
| -
|
| -void RequestQueueInMemoryStore::RemoveRequestsByClientId(
|
| - const std::vector<ClientId>& client_ids,
|
| - const RemoveCallback& callback) {
|
| - int count = 0;
|
| -
|
| - std::set<ClientId> client_id_set(client_ids.begin(), client_ids.end());
|
| - for (auto iter = requests_.begin(); iter != requests_.end(); ) {
|
| - if (client_id_set.find(iter->second.client_id()) != client_id_set.end()) {
|
| - requests_.erase(iter++);
|
| - ++count;
|
| + result = RequestQueue::UpdateRequestResult::SUCCESS;
|
| } else {
|
| - ++iter;
|
| + result = RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
|
| }
|
| + results.push_back(std::make_pair(request_id, result));
|
| }
|
|
|
| - base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| - FROM_HERE, base::Bind(callback, true, count));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
|
| + base::Bind(callback, results));
|
| }
|
|
|
| void RequestQueueInMemoryStore::Reset(const ResetCallback& callback) {
|
|
|