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

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/change_requests_state_task.h"
+#include "components/offline_pages/background/remove_requests_task.h"
 #include "components/offline_pages/background/request_queue_store.h"
 #include "components/offline_pages/background/save_page_request.h"
 
 namespace offline_pages {
 
 namespace {
 // Completes the get requests call.
 void GetRequestsDone(const RequestQueue::GetRequestsCallback& callback,
                      bool success,
                      std::vector<std::unique_ptr<SavePageRequest>> requests) {
@@ skipping 45 matching lines @@
       result = RequestQueue::UpdateRequestResult::STORE_FAILURE;
     else if (status == ItemActionStatus::NOT_FOUND)
       result = RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
     else
       result = RequestQueue::UpdateRequestResult::SUCCESS;
   }
 
   callback.Run(result);
 }
 
-// Completes the remove request call.
-void RemoveRequestsDone(
-    const RequestQueue::RemoveRequestsCallback& callback,
-    const RequestQueue::UpdateMultipleRequestResults& results,
-    std::vector<std::unique_ptr<SavePageRequest>> requests) {
-  callback.Run(results, std::move(requests));
-}
-
 }  // namespace
 
 RequestQueue::RequestQueue(std::unique_ptr<RequestQueueStore> store)
     : store_(std::move(store)), weak_ptr_factory_(this) {}
 
 RequestQueue::~RequestQueue() {}
 
 void RequestQueue::GetRequests(const GetRequestsCallback& callback) {
   store_->GetRequests(base::Bind(&GetRequestsDone, callback));
 }
@@ skipping 50 matching lines @@
     return;
   }
 
   // Since the request exists, update it.
   std::vector<SavePageRequest> update_requests{update_request};
   store_->UpdateRequests(update_requests,
                          base::Bind(&UpdateRequestsDone, update_callback));
 }
 
 void RequestQueue::RemoveRequests(const std::vector<int64_t>& request_ids,
-                                  const RemoveRequestsCallback& callback) {
-  store_->RemoveRequests(request_ids, base::Bind(RemoveRequestsDone, callback));
+                                  const UpdateCallback& callback) {
+  std::unique_ptr<Task> task(
+      new RemoveRequestsTask(store_.get(), request_ids, callback));
+  task_queue_.AddTask(std::move(task));
 }
 
 void RequestQueue::ChangeRequestsState(
     const std::vector<int64_t>& request_ids,
     const SavePageRequest::RequestState new_state,
     const RequestQueue::UpdateCallback& callback) {
   std::unique_ptr<Task> task(new ChangeRequestsStateTask(
       store_.get(), request_ids, new_state, callback));
   task_queue_.AddTask(std::move(task));
 }
 
 void RequestQueue::PurgeRequests(const PurgeRequestsCallback& callback) {}
 
 }  // namespace offline_pages