Remove all synchronous methods from OfflinePageBridge.

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 76 matching lines @@
     offline_pages_vector.push_back(page.spec());
 
   ScopedJavaLocalRef<jobjectArray> j_result_array =
       base::android::ToJavaArrayOfStrings(env, offline_pages_vector);
   DCHECK(j_result_array.obj());
 
   Java_CheckPagesExistOfflineCallbackInternal_onResult(env, j_callback_obj,
                                                        j_result_array);
 }
 
-void GetAllPagesCallback(
+void MultipleOfflinePageItemCallback(
     const ScopedJavaGlobalRef<jobject>& j_result_obj,
     const ScopedJavaGlobalRef<jobject>& j_callback_obj,
     const OfflinePageModel::MultipleOfflinePageItemResult& result) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ToJavaOfflinePageList(env, j_result_obj.obj(), result);
   base::android::RunCallbackAndroid(j_callback_obj, j_result_obj);
 }
 
 void SavePageCallback(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
                       const GURL& url,
@@ skipping 217 matching lines @@
     const JavaParamRef<jobject>& j_callback_obj) {
   DCHECK(j_result_obj);
   DCHECK(j_callback_obj);
 
   ScopedJavaGlobalRef<jobject> j_result_ref;
   j_result_ref.Reset(env, j_result_obj);
 
   ScopedJavaGlobalRef<jobject> j_callback_ref;
   j_callback_ref.Reset(env, j_callback_obj);
 
-  offline_page_model_->GetAllPages(
-      base::Bind(&GetAllPagesCallback, j_result_ref, j_callback_ref));
+  offline_page_model_->GetAllPages(base::Bind(&MultipleOfflinePageItemCallback,
+                                              j_result_ref, j_callback_ref));
 }
 
-ScopedJavaLocalRef<jlongArray> OfflinePageBridge::GetOfflineIdsForClientId(
+void OfflinePageBridge::GetPageByOfflineId(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jstring>& j_namespace,
-    const JavaParamRef<jstring>& j_client_id) {
-  DCHECK(offline_page_model_->is_loaded());
-  offline_pages::ClientId client_id;
-  client_id.name_space = ConvertJavaStringToUTF8(env, j_namespace);
-  client_id.id = ConvertJavaStringToUTF8(env, j_client_id);
-
-  std::vector<int64_t> results =
-      offline_page_model_->MaybeGetOfflineIdsForClientId(client_id);
-
-  return base::android::ToJavaLongArray(env, results);
+    jlong offline_id,
+    const JavaParamRef<jobject>& j_callback_obj) {
+  ScopedJavaGlobalRef<jobject> j_callback_ref;
+  j_callback_ref.Reset(env, j_callback_obj);
+  offline_page_model_->GetPageByOfflineId(
+      offline_id, base::Bind(&SingleOfflinePageItemCallback, j_callback_ref));
 }
 
-ScopedJavaLocalRef<jobject> OfflinePageBridge::GetPageByOfflineId(
+std::vector<ClientId> getClientIdsFromObjectArrays(
+    JNIEnv* env,
+    const JavaParamRef<jobjectArray>& j_namespaces_array,
+    const JavaParamRef<jobjectArray>& j_ids_array) {
+  std::vector<std::string> name_spaces;
+  std::vector<std::string> ids;
+  base::android::AppendJavaStringArrayToStringVector(
+      env, j_namespaces_array.obj(), &name_spaces);
+  base::android::AppendJavaStringArrayToStringVector(env, j_ids_array.obj(),
+                                                     &ids);
+  DCHECK_EQ(name_spaces.size(), ids.size());
+  std::vector<ClientId> client_ids;
+
+  for (size_t i = 0; i < name_spaces.size(); i++) {
+    offline_pages::ClientId client_id;
+    client_id.name_space = name_spaces[i];
+    client_id.id = ids[i];
+    client_ids.emplace_back(client_id);
+  }
+
+  return client_ids;
+}
+
+void OfflinePageBridge::DeletePagesByClientId(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    jlong offline_id) {
-  const OfflinePageItem* offline_page =
-      offline_page_model_->MaybeGetPageByOfflineId(offline_id);
-  if (!offline_page)
-    return ScopedJavaLocalRef<jobject>();
-  return ToJavaOfflinePageItem(env, *offline_page);
+    const JavaParamRef<jobjectArray>& j_namespaces_array,
+    const JavaParamRef<jobjectArray>& j_ids_array,
+    const JavaParamRef<jobject>& j_callback_obj) {
+  ScopedJavaGlobalRef<jobject> j_callback_ref;
+  j_callback_ref.Reset(env, j_callback_obj);
+  std::vector<ClientId> client_ids =
+      getClientIdsFromObjectArrays(env, j_namespaces_array, j_ids_array);
+  offline_page_model_->DeletePagesByClientIds(
+      client_ids, base::Bind(&DeletePageCallback, j_callback_ref));
+}
+
+void OfflinePageBridge::GetPagesByClientId(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jobject>& j_result_obj,
+    const JavaParamRef<jobjectArray>& j_namespaces_array,
+    const JavaParamRef<jobjectArray>& j_ids_array,
+    const JavaParamRef<jobject>& j_callback_obj) {
+  ScopedJavaGlobalRef<jobject> j_result_ref;
+  j_result_ref.Reset(env, j_result_obj);
+
+  ScopedJavaGlobalRef<jobject> j_callback_ref;
+  j_callback_ref.Reset(env, j_callback_obj);
+  std::vector<ClientId> client_ids =
+      getClientIdsFromObjectArrays(env, j_namespaces_array, j_ids_array);
+  offline_page_model_->GetPagesByClientIds(
+      client_ids, base::Bind(&MultipleOfflinePageItemCallback, j_result_ref,
+                             j_callback_ref));
 }
 
 void OfflinePageBridge::SelectPageForOnlineUrl(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_online_url,
     int tab_id,
     const JavaParamRef<jobject>& j_callback_obj) {
   DCHECK(j_callback_obj);
 
@@ skipping 52 matching lines @@
   RequestCoordinator* coordinator =
       offline_pages::RequestCoordinatorFactory::GetInstance()->
           GetForBrowserContext(browser_context_);
 
   coordinator->SavePageLater(
       GURL(ConvertJavaStringToUTF8(env, j_url)), client_id,
       static_cast<bool>(user_requested),
       RequestCoordinator::RequestAvailability::ENABLED_FOR_OFFLINER);
 }
 
-void OfflinePageBridge::DeletePages(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& j_callback_obj,
-    const JavaParamRef<jlongArray>& offline_ids_array) {
-  DCHECK(j_callback_obj);
-
-  ScopedJavaGlobalRef<jobject> j_callback_ref;
-  j_callback_ref.Reset(env, j_callback_obj);
-
-  std::vector<int64_t> offline_ids;
-  base::android::JavaLongArrayToInt64Vector(env, offline_ids_array,
-                                            &offline_ids);
-
-  offline_page_model_->DeletePagesByOfflineId(
-      offline_ids, base::Bind(&DeletePageCallback, j_callback_ref));
-}
-
 ScopedJavaLocalRef<jstring> OfflinePageBridge::GetOfflinePageHeaderForReload(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& j_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(j_web_contents);
   if (!web_contents)
     return ScopedJavaLocalRef<jstring>();
 
   const offline_pages::OfflinePageHeader* offline_header =
@@ skipping 76 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