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

chrome/browser/android/offline_pages/offline_page_bridge.cc

 // Copyright 2015 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 "chrome/browser/android/offline_pages/offline_page_bridge.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 151 matching lines @@
 void OnGetAllRequestsDone(
     const ScopedJavaGlobalRef<jobject>& j_callback_obj,
     std::vector<std::unique_ptr<SavePageRequest>> all_requests) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   ScopedJavaLocalRef<jobjectArray> j_result_obj =
       CreateJavaSavePageRequests(env, std::move(all_requests));
   base::android::RunCallbackAndroid(j_callback_obj, j_result_obj);
 }
 
-void OnRemoveRequestsDone(
-    const ScopedJavaGlobalRef<jobject>& j_callback_obj,
-    const RequestQueue::UpdateMultipleRequestResults& removed_request_results) {
+RequestQueue::UpdateRequestResult ToUpdateRequestResult(
+    ItemActionStatus status) {
+  switch (status) {
+    case ItemActionStatus::SUCCESS:
+      return RequestQueue::UpdateRequestResult::SUCCESS;
+    case ItemActionStatus::NOT_FOUND:
+      return RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
+    case ItemActionStatus::STORE_ERROR:
+      return RequestQueue::UpdateRequestResult::STORE_FAILURE;
+    case ItemActionStatus::ALREADY_EXISTS:
+    default:
+      NOTREACHED();
+  }
+  return RequestQueue::UpdateRequestResult::STORE_FAILURE;
+}
+
+void OnRemoveRequestsDone(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
+                          const MultipleItemStatuses& removed_request_results) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   std::vector<int> update_request_results;
   std::vector<int64_t> update_request_ids;
 
-  for (std::pair<int64_t, RequestQueue::UpdateRequestResult> remove_result :
+  for (std::pair<int64_t, ItemActionStatus> remove_result :
        removed_request_results) {
     update_request_ids.emplace_back(std::get<0>(remove_result));
     update_request_results.emplace_back(
-        static_cast<int>(std::get<1>(remove_result)));
+        static_cast<int>(ToUpdateRequestResult(std::get<1>(remove_result))));
   }
 
   ScopedJavaLocalRef<jlongArray> j_result_ids =
       base::android::ToJavaLongArray(env, update_request_ids);
   ScopedJavaLocalRef<jintArray> j_result_codes =
       base::android::ToJavaIntArray(env, update_request_results);
 
   Java_RequestsRemovedCallback_onResult(env, j_callback_obj, j_result_ids,
                                         j_result_codes);
 }
@@ skipping 345 matching lines @@
       env, ConvertUTF8ToJavaString(env, client_id.name_space),
       ConvertUTF8ToJavaString(env, client_id.id));
 }
 
 bool RegisterOfflinePageBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace offline_pages