fix a problem that download dangerous files in a blank page can fail with authentication

content/browser/android/download_controller_android_impl.cc

 // Copyright (c) 2012 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 "content/browser/android/download_controller_android_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 225 matching lines @@
 
   // Register for updates to the DownloadItem.
   download_item->AddObserver(this);
 
   ScopedJavaLocalRef<jobject> view =
       GetContentViewCoreFromWebContents(download_item->GetWebContents());
   // The view went away. Can't proceed.
   if (view.is_null())
     return;
 
+  ScopedJavaLocalRef<jstring> jmime_type =
+      ConvertUTF8ToJavaString(env, download_item->GetMimeType());
+  ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString(
+      env, download_item->GetTargetFilePath().BaseName().value());
   Java_DownloadController_onDownloadStarted(
-      env, GetJavaObject()->Controller(env).obj(), view.obj());
+      env, GetJavaObject()->Controller(env).obj(), view.obj(), jfilename.obj(),
+      jmime_type.obj());
 }
 
 void DownloadControllerAndroidImpl::OnDownloadUpdated(DownloadItem* item) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (item->IsDangerous() && !item->IsCancelled())
     OnDangerousDownload(item);
 
   if (!item->IsComplete())
     return;
 
   // Multiple OnDownloadUpdated() notifications may be issued while the download
   // is in the COMPLETE state. Only handle one.
   item->RemoveObserver(this);
 
-  ScopedJavaLocalRef<jobject> view_core = GetContentViewCoreFromWebContents(
-      item->GetWebContents());
-  if (view_core.is_null()) {
-    // We can get NULL WebContents from the DownloadItem.
-    return;
-  }
-
-  // Call onHttpPostDownloadCompleted
+  // Call onDownloadCompleted
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jurl =
       ConvertUTF8ToJavaString(env, item->GetURL().spec());
-  ScopedJavaLocalRef<jstring> jcontent_disposition =
-      ConvertUTF8ToJavaString(env, item->GetContentDisposition());
   ScopedJavaLocalRef<jstring> jmime_type =
       ConvertUTF8ToJavaString(env, item->GetMimeType());
   ScopedJavaLocalRef<jstring> jpath =
       ConvertUTF8ToJavaString(env, item->GetTargetFilePath().value());
+  ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString(
+      env, item->GetTargetFilePath().BaseName().value());
 
-  Java_DownloadController_onDownloadCompleted(env,
-      GetJavaObject()->Controller(env).obj(), view_core.obj(), jurl.obj(),
-      jcontent_disposition.obj(), jmime_type.obj(), jpath.obj(),
-      item->GetReceivedBytes(), true);
+  Java_DownloadController_onDownloadCompleted(
+      env, GetJavaObject()->Controller(env).obj(),
+      base::android::GetApplicationContext(), jurl.obj(), jmime_type.obj(),
+      jfilename.obj(), jpath.obj(), item->GetReceivedBytes(), true);
 }
 
 void DownloadControllerAndroidImpl::OnDangerousDownload(DownloadItem* item) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString(
       env, item->GetTargetFilePath().BaseName().value());
   ScopedJavaLocalRef<jobject> view_core = GetContentViewCoreFromWebContents(
       item->GetWebContents());
   if (!view_core.is_null()) {
     Java_DownloadController_onDangerousDownload(
@@ skipping 89 matching lines @@
     referer = referer_url.spec();
   if (!request->url_chain().empty()) {
     original_url = request->url_chain().front();
     url = request->url_chain().back();
   }
 }
 
 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {}
 
 }  // namespace content