Changes to fit better with the needs of the download manager.

components/offline_pages/background/request_queue.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.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/offline_pages/background/request_queue_store.h"
@@ skipping 32 matching lines @@
                        RequestQueueStore::UpdateStatus status) {
   RequestQueue::UpdateRequestResult result =
       (status == RequestQueueStore::UpdateStatus::UPDATED)
           ? RequestQueue::UpdateRequestResult::SUCCESS
           : RequestQueue::UpdateRequestResult::STORE_FAILURE;
   callback.Run(result);
 }
 
 
 // Completes the remove request call.
-void RemoveRequestDone(const RequestQueue::UpdateRequestCallback& callback,
-                       bool success,
-                       int deleted_requests_count) {
-  DCHECK_EQ(1, deleted_requests_count);
-  RequestQueue::UpdateRequestResult result =
-      success ? RequestQueue::UpdateRequestResult::SUCCESS
-              : RequestQueue::UpdateRequestResult::STORE_FAILURE;
-  callback.Run(result);
+void RemoveRequestsDone(
+    const RequestQueue::RemoveRequestsCallback& callback,
+    const RequestQueue::UpdateMultipleRequestResults& results) {
+  callback.Run(results);
 }
 
 }  // namespace
 
 RequestQueue::RequestQueue(std::unique_ptr<RequestQueueStore> store)
     : store_(std::move(store)), weak_ptr_factory_(this) {}
 
 RequestQueue::~RequestQueue() {}
 
 void RequestQueue::GetRequests(const GetRequestsCallback& callback) {
@@ skipping 51 matching lines @@
     update_callback.Run(
         RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST);
     return;
   }
 
   // Since the request exists, update it.
   store_->AddOrUpdateRequest(update_request,
                              base::Bind(&UpdateRequestDone, update_callback));
 }
 
-void RequestQueue::RemoveRequest(int64_t request_id,
-                                 const UpdateRequestCallback& callback) {
-  std::vector<int64_t> request_ids{request_id};
-  store_->RemoveRequests(request_ids, base::Bind(RemoveRequestDone, callback));
-}
-
-void RequestQueue::RemoveRequestsByClientId(
-    const std::vector<ClientId>& client_ids,
-    const UpdateRequestCallback& callback) {
-  store_->RemoveRequestsByClientId(client_ids,
-                                   base::Bind(RemoveRequestDone, callback));
+void RequestQueue::RemoveRequests(const std::vector<int64_t>& request_ids,
+                                  const RemoveRequestsCallback& callback) {
+  store_->RemoveRequests(request_ids, base::Bind(RemoveRequestsDone, callback));
 }
 
 void RequestQueue::PurgeRequests(const PurgeRequestsCallback& callback) {}
 
 }  // namespace offline_pages