[Offline pages] Removing RequestQueueStore::UpdateMultipleRequestsCallback

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 @@
       result = RequestQueue::AddRequestResult::STORE_FAILURE;
       break;
     case ItemActionStatus::NOT_FOUND:
     default:
       NOTREACHED();
       return;
   }
   callback.Run(result, request);
 }
 
+RequestQueue::UpdateRequestResult ToUpdateRequestResult(
+    ItemActionStatus status) {
+  switch (status) {
+    case ItemActionStatus::SUCCESS:
+      return RequestQueue::UpdateRequestResult::SUCCESS;
+    case ItemActionStatus::STORE_ERROR:
+      return RequestQueue::UpdateRequestResult::STORE_FAILURE;
+    case ItemActionStatus::NOT_FOUND:
+      return RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
+    case ItemActionStatus::ALREADY_EXISTS:
+    default:
+      NOTREACHED();
+      return RequestQueue::UpdateRequestResult::STORE_FAILURE;
+  }
+}
+
 // 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);
 }
 
 // Handles updating multiple requests at the same time.
 void UpdateMultipleRequestsDone(
     const RequestQueue::UpdateMultipleRequestsCallback& callback,
-    const RequestQueue::UpdateMultipleRequestResults& results,
-    std::vector<std::unique_ptr<SavePageRequest>> requests) {
+    std::unique_ptr<UpdateRequestsResult> result) {
+  RequestQueue::UpdateMultipleRequestResults results;
+  std::vector<std::unique_ptr<SavePageRequest>> requests;
+  for (const auto& item_status : result->item_statuses) {
+    results.push_back(std::make_pair(
+        item_status.first, ToUpdateRequestResult(item_status.second)));
+  }
+  for (const auto& item : result->updated_items) {
+    std::unique_ptr<SavePageRequest> request(new SavePageRequest(item));
+    requests.push_back(std::move(request));
+  }
+
   callback.Run(results, std::move(requests));
 }
 
 // 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));
 }
@@ skipping 76 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