[Offline pages] Extracting AddRequest method in RequestQueueStore

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 12 matching lines @@
   // TODO(fgorski): Filter out expired requests based on policy.
   // This may trigger the purging if necessary.
   // Also this may be turned into a method on the request queue or add a policy
   // parameter in the process.
   callback.Run(result, std::move(requests));
 }
 
 // Completes the add request call.
 void AddRequestDone(const RequestQueue::AddRequestCallback& callback,
                     const SavePageRequest& request,
-                    RequestQueueStore::UpdateStatus status) {
-  RequestQueue::AddRequestResult result =
-      (status == RequestQueueStore::UpdateStatus::UPDATED)
-          ? RequestQueue::AddRequestResult::SUCCESS
-          : RequestQueue::AddRequestResult::STORE_FAILURE;
+                    ItemActionStatus status) {
+  RequestQueue::AddRequestResult result;
+  switch (status) {
+    case ItemActionStatus::SUCCESS:
+      result = RequestQueue::AddRequestResult::SUCCESS;
+      break;
+    case ItemActionStatus::ALREADY_EXISTS:
+      result = RequestQueue::AddRequestResult::ALREADY_EXISTS;
+      break;
+    case ItemActionStatus::STORE_ERROR:
+      result = RequestQueue::AddRequestResult::STORE_FAILURE;
+      break;
+    case ItemActionStatus::NOT_FOUND:
+    default:
+      NOTREACHED();
+      return;
+  }
   callback.Run(result, request);
 }
 
 // Completes the update request call.
 // TODO(petewil): Move callers to the UpdateMultipleRequestDone callback
 void UpdateRequestDone(const RequestQueue::UpdateRequestCallback& callback,
                        RequestQueueStore::UpdateStatus status) {
   RequestQueue::UpdateRequestResult result =
       (status == RequestQueueStore::UpdateStatus::UPDATED)
           ? RequestQueue::UpdateRequestResult::SUCCESS
@@ skipping 25 matching lines @@
 RequestQueue::~RequestQueue() {}
 
 void RequestQueue::GetRequests(const GetRequestsCallback& callback) {
   store_->GetRequests(base::Bind(&GetRequestsDone, callback));
 }
 
 void RequestQueue::AddRequest(const SavePageRequest& request,
                               const AddRequestCallback& callback) {
   // TODO(fgorski): check that request makes sense.
   // TODO(fgorski): check that request does not violate policy.
-  store_->AddOrUpdateRequest(request,
-                             base::Bind(&AddRequestDone, callback, 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 AddOrUpdateRequest method, where it ends up calling back
   // to the request queue client.
@@ skipping 48 matching lines @@
     const std::vector<int64_t>& request_ids,
     const SavePageRequest::RequestState new_state,
     const UpdateMultipleRequestsCallback& callback) {
   store_->ChangeRequestsState(request_ids, new_state,
                               base::Bind(UpdateMultipleRequestsDone, callback));
 }
 
 void RequestQueue::PurgeRequests(const PurgeRequestsCallback& callback) {}
 
 }  // namespace offline_pages