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;

[fgorski, 2016/08/09 04:00:50]

please add missing using statement here:
using base::android::JavaParamRef;

[Dmitry Titov, 2016/08/12 04:01:39]

Done.

 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace offline_pages {
 namespace android {
 
 namespace {
 
 void ToJavaOfflinePageDownloadItemList(JNIEnv* env,
                                        jobject j_result_obj,
@@ skipping 37 matching lines @@
 
 void OfflinePageDownloadBridge::Destroy(JNIEnv* env,
                                         const JavaParamRef<jobject>&) {
   download_ui_adapter_->RemoveObserver(this);
   delete this;
 }
 
 void OfflinePageDownloadBridge::GetAllItems(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& j_result_obj) {

[fgorski, 2016/08/09 04:00:50]

because of this.

[Dmitry Titov, 2016/08/12 04:01:39]

Acknowledged.

   DCHECK(j_result_obj);
 
   const DownloadUIItemsMap& items_map = download_ui_adapter_->GetAllItems();
   ToJavaOfflinePageDownloadItemList(env, j_result_obj, items_map);
 }
 
 ScopedJavaLocalRef<jobject> OfflinePageDownloadBridge::GetItemByGuid(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const base::android::JavaParamRef<jstring>& j_guid) {

[fgorski, 2016/08/09 04:00:50]

remove base::android:: from here, and other JavaParamRef

[Dmitry Titov, 2016/08/12 04:01:39]

Done.

   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 base::android::JavaParamRef<jstring>& j_guid) {

[fgorski, 2016/08/09 04:00:50]

including here.

[Dmitry Titov, 2016/08/12 04:01:39]

Done.

+  std::string guid = ConvertJavaStringToUTF8(env, j_guid);
+  download_ui_adapter_->DeleteItem(guid);
+}
+
+ScopedJavaLocalRef<jstring> OfflinePageDownloadBridge::GetOfflineUrlByGuid(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const base::android::JavaParamRef<jstring>& j_guid) {

[fgorski, 2016/08/09 04:00:50]

and here.

[Dmitry Titov, 2016/08/12 04:01:39]

Done.

+  std::string guid = ConvertJavaStringToUTF8(env, j_guid);
+  std::string url = download_ui_adapter_->GetOfflineUrlByGuid(guid);
+  if (url.empty())
+    return ScopedJavaLocalRef<jstring>();
+  return ConvertUTF8ToJavaString(env, url);

[fgorski, 2016/08/09 04:00:50]

It should simply work if url is empty, I don't think you need 2 return
statements here.

[Dmitry Titov, 2016/08/12 04:01:39]

Done.

+}
+
 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