[Offline pages] Updating RequestQueue::RemoveRequests to use a TaskQueue

components/offline_pages/background/request_queue_in_memory_store.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/offline_pages/background/request_queue_in_memory_store.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/offline_pages/background/save_page_request.h"
@@ skipping 51 matching lines @@
     result->item_statuses.push_back(
         std::make_pair(request.request_id(), status));
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, base::Passed(&result)));
 }
 
 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) {
   requests_.clear();
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 base::Bind(callback, true));
 }
 
 StoreState RequestQueueInMemoryStore::state() const {
   return StoreState::LOADED;
 }
 
 }  // namespace offline_pages