Switch to use download GUID to indentify download items

chrome/browser/android/download/chrome_download_delegate.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/download/chrome_download_delegate.h"
 
 #include <jni.h>
 #include <string>
 
 #include "base/android/jni_android.h"
@@ skipping 30 matching lines @@
 // Returns true if a file name is dangerous, or false otherwise.
 static jboolean IsDownloadDangerous(JNIEnv* env,
                                     const JavaParamRef<jclass>& clazz,
                                     const JavaParamRef<jstring>& filename) {
   base::FilePath path(base::android::ConvertJavaStringToUTF8(env, filename));
   return download_util::GetFileDangerLevel(path) !=
       download_util::NOT_DANGEROUS;
 }
 
 // Called when a dangerous download is validated.
-static void DangerousDownloadValidated(JNIEnv* env,
-                                       const JavaParamRef<jclass>& clazz,
-                                       const JavaParamRef<jobject>& tab,
-                                       jint download_id,
-                                       jboolean accept) {
+static void DangerousDownloadValidated(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& clazz,
+    const JavaParamRef<jobject>& tab,
+    const JavaParamRef<jstring>& jdownload_guid,
+    jboolean accept) {
+  std::string download_guid =
+      base::android::ConvertJavaStringToUTF8(env, jdownload_guid);
   TabAndroid* tab_android = TabAndroid::GetNativeTab(env, tab);
   DownloadControllerAndroid::Get()->DangerousDownloadValidated(
-      tab_android->web_contents(), download_id, accept);
+      tab_android->web_contents(), download_guid, accept);
 }
 
 // static
 bool ChromeDownloadDelegate::EnqueueDownloadManagerRequest(
     jobject chrome_download_delegate,
     bool overwrite,
     jobject download_info) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   return Java_ChromeDownloadDelegate_enqueueDownloadManagerRequestFromNative(
@@ skipping 47 matching lines @@
   PermissionUpdateInfoBarDelegate::Create(
       tab_android->web_contents(),
       permissions,
       IDS_MISSING_STORAGE_PERMISSION_DOWNLOAD_EDUCATION_TEXT,
       *cb);
 }
 
 bool RegisterChromeDownloadDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }