[Offline Pages] Converts MarkAttemptCompleted to use TaskQueue

components/offline_pages/background/request_queue.cc

Index: components/offline_pages/background/request_queue.cc
diff --git a/components/offline_pages/background/request_queue.cc b/components/offline_pages/background/request_queue.cc
index 542b1f43763aecfd87749bb4c4e680cb35c01379..8e2103e84ba200162b4b81a79dd3ee231bba4fb8 100644
--- a/components/offline_pages/background/request_queue.cc
+++ b/components/offline_pages/background/request_queue.cc
@@ -4,11 +4,14 @@
 
 #include "components/offline_pages/background/request_queue.h"
 
+#include <utility>
+
 #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/mark_attempt_aborted_task.h"
+#include "components/offline_pages/background/mark_attempt_completed_task.h"
 #include "components/offline_pages/background/mark_attempt_started_task.h"
 #include "components/offline_pages/background/remove_requests_task.h"
 #include "components/offline_pages/background/request_queue_store.h"
@@ -54,28 +57,6 @@ void AddRequestDone(const RequestQueue::AddRequestCallback& callback,
   callback.Run(result, request);
 }
 
-// Completes the update request call.
-// TODO(fgorski): For specific cases, check that appropriate items were updated.
-void UpdateRequestsDone(const RequestQueue::UpdateRequestCallback& callback,
-                        std::unique_ptr<UpdateRequestsResult> store_result) {
-  RequestQueue::UpdateRequestResult result;
-  if (store_result->store_state != StoreState::LOADED) {
-    result = RequestQueue::UpdateRequestResult::STORE_FAILURE;
-  } else if (store_result->item_statuses.size() == 0) {
-    result = RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
-  } else {
-    ItemActionStatus status = store_result->item_statuses.begin()->second;
-    if (status == ItemActionStatus::STORE_ERROR)
-      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);
-}
-
 }  // namespace
 
 RequestQueue::RequestQueue(std::unique_ptr<RequestQueueStore> store)
@@ -94,57 +75,6 @@ void RequestQueue::AddRequest(const SavePageRequest& request,
   store_->AddRequest(request, base::Bind(&AddRequestDone, callback, request));
 }
 
-void RequestQueue::UpdateRequest(const SavePageRequest& update_request,
-                                 const UpdateRequestCallback& update_callback) {
-  // We have to pass the update_callback *through* the get callback.  We do this
-  // by currying the update_callback as a parameter to be used when calling
-  // GetForUpdateDone.  The actual request queue store get operation will not
-  // see this bound parameter, but just pass it along.  GetForUpdateDone then
-  // passes it into the UpdateRequests method, where it ends up calling back
-  // to the request queue client.
-  // TODO(petewil): This would be more efficient if the store supported a call
-  // to get a single item by ID.  Change this code to use that API when added.
-  // crbug.com/630657.
-  store_->GetRequests(base::Bind(
-      &RequestQueue::GetForUpdateDone, weak_ptr_factory_.GetWeakPtr(),
-      update_callback, update_request));
-}
-
-// We need a different version of the GetCallback that can take the curried
-// update_callback as a parameter, and call back into the request queue store
-// implementation.  This must be a member function because we need access to
-// the store pointer to call UpdateRequests.
-void RequestQueue::GetForUpdateDone(
-    const UpdateRequestCallback& update_callback,
-    const SavePageRequest& update_request,
-    bool success,
-    std::vector<std::unique_ptr<SavePageRequest>> found_requests) {
-  // If the result was not found, return now.
-  if (!success) {
-    update_callback.Run(
-        RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST);
-    return;
-  }
-  // If the found result does not contain the request we are looking for, return
-  // now.
-  bool found = false;
-  std::vector<std::unique_ptr<SavePageRequest>>::const_iterator iter;
-  for (iter = found_requests.begin(); iter != found_requests.end(); ++iter) {
-    if ((*iter)->request_id() == update_request.request_id())
-      found = true;
-  }
-  if (!found) {
-    update_callback.Run(
-        RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST);
-    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 UpdateCallback& callback) {
   std::unique_ptr<Task> task(
@@ -175,6 +105,13 @@ void RequestQueue::MarkAttemptAborted(int64_t request_id,
   task_queue_.AddTask(std::move(task));
 }
 
+void RequestQueue::MarkAttemptCompleted(int64_t request_id,
+                                        const UpdateCallback& callback) {
+  std::unique_ptr<Task> task(
+      new MarkAttemptCompletedTask(store_.get(), request_id, callback));
+  task_queue_.AddTask(std::move(task));
+}
+
 void RequestQueue::PurgeRequests(const PurgeRequestsCallback& callback) {}
 
 }  // namespace offline_pages