Implement deleteItem and openItem on OfflinePageDownloadBridge.

chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.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 "chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.h"
 
 #include <vector>
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "components/offline_pages/downloads/download_ui_item.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "jni/OfflinePageDownloadBridge_jni.h"
 #include "net/base/filename_util.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace offline_pages {
 namespace android {
 
 namespace {
 
-void ToJavaOfflinePageDownloadItemList(JNIEnv* env,
-                                       jobject j_result_obj,
-                                       const DownloadUIItemsMap& items_map) {
-  for (const auto& guid_item_pair : items_map) {
-    const DownloadUIItem& item = *(guid_item_pair.second.get());
+void ToJavaOfflinePageDownloadItemList(
+    JNIEnv* env,
+    jobject j_result_obj,
+    const std::vector<const DownloadUIItem*>& items) {
+  for (const auto item : items) {
     Java_OfflinePageDownloadBridge_createDownloadItemAndAddToList(
-        env, j_result_obj, ConvertUTF8ToJavaString(env, item.guid).obj(),
-        ConvertUTF8ToJavaString(env, item.url.spec()).obj(),
-        ConvertUTF8ToJavaString(env, item.target_path.value()).obj(),
-        item.start_time.ToJavaTime(), item.total_bytes);
+        env, j_result_obj, ConvertUTF8ToJavaString(env, item->guid).obj(),
+        ConvertUTF8ToJavaString(env, item->url.spec()).obj(),
+        ConvertUTF8ToJavaString(env, item->target_path.value()).obj(),
+        item->start_time.ToJavaTime(), item->total_bytes);
   }
 }
 
 ScopedJavaLocalRef<jobject> ToJavaOfflinePageDownloadItem(
     JNIEnv* env,
     const DownloadUIItem& item) {
   return Java_OfflinePageDownloadBridge_createDownloadItem(
       env, ConvertUTF8ToJavaString(env, item.guid).obj(),
       ConvertUTF8ToJavaString(env, item.url.spec()).obj(),
       ConvertUTF8ToJavaString(env, item.target_path.value()).obj(),
@@ skipping 23 matching lines @@
   download_ui_adapter_->RemoveObserver(this);
   delete this;
 }
 
 void OfflinePageDownloadBridge::GetAllItems(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& j_result_obj) {
   DCHECK(j_result_obj);
 
-  const DownloadUIItemsMap& items_map = download_ui_adapter_->GetAllItems();
-  ToJavaOfflinePageDownloadItemList(env, j_result_obj, items_map);
+  std::vector<const DownloadUIItem*> items =
+      download_ui_adapter_->GetAllItems();
+  ToJavaOfflinePageDownloadItemList(env, j_result_obj, items);
 }
 
 ScopedJavaLocalRef<jobject> OfflinePageDownloadBridge::GetItemByGuid(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    const base::android::JavaParamRef<jstring>& j_guid) {
+    const JavaParamRef<jstring>& j_guid) {
   std::string guid = ConvertJavaStringToUTF8(env, j_guid);
   const DownloadUIItem* item = download_ui_adapter_->GetItem(guid);
   return ToJavaOfflinePageDownloadItem(env, *item);
 }
 
+void OfflinePageDownloadBridge::DeleteItemByGuid(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jstring>& j_guid) {
+  std::string guid = ConvertJavaStringToUTF8(env, j_guid);
+  download_ui_adapter_->DeleteItem(guid);
+}
+
+ScopedJavaLocalRef<jstring> OfflinePageDownloadBridge::GetOfflineUrlByGuid(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jstring>& j_guid) {
+  std::string guid = ConvertJavaStringToUTF8(env, j_guid);
+  std::string url = download_ui_adapter_->GetOfflineUrlByGuid(guid);
+  return ConvertUTF8ToJavaString(env, url);

[fgorski, 2016/08/12 15:43:52]

you know what, I think depending on what you want to get on the other side,
(null vs. empty string), you might have had it correct the first time.
I remember mtreib using the if() to return null I think instead of empty string.
https://codereview.chromium.org/1514833002

Feel free to revert this to the previous code, which was correct if you wanted
null on Java side instead of an empty string.

[Dmitry Titov, 2016/08/12 19:43:36]

I check for empty string on Java side and not for null. I think it's better to
return null indeed and check for null rather than a content of a string.

[Dmitry Titov, 2016/08/12 19:43:36]

reverted back tand check for null. needed it for GURL anyways.

+}
+
 void OfflinePageDownloadBridge::ItemsLoaded() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_OfflinePageDownloadBridge_downloadItemsLoaded(env, obj.obj());
 }
 
 void OfflinePageDownloadBridge::ItemAdded(const DownloadUIItem& item) {
   JNIEnv* env = AttachCurrentThread();
@@ skipping 31 matching lines @@
 
   DownloadUIAdapter* adapter =
       DownloadUIAdapter::FromOfflinePageModel(offline_page_model);
 
   return reinterpret_cast<jlong>(
       new OfflinePageDownloadBridge(env, obj, adapter));
 }
 
 }  // namespace android
 }  // namespace offline_pages