Use native implementation of dangerous download infobar

chrome/browser/android/download/download_controller.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/download/download_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/download/chrome_download_delegate.h"
+#include "chrome/browser/android/download/dangerous_download_infobar_delegate.h"
+#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/referrer.h"
 #include "jni/DownloadController_jni.h"
 #include "net/base/filename_util.h"
@@ skipping 213 matching lines @@
       ChromeDownloadDelegate::FromWebContents(web_contents);
   if (delegate) {
     delegate->OnDownloadStarted(
         download_item->GetTargetFilePath().BaseName().value());
   }
   OnDownloadUpdated(download_item);
 }
 
 void DownloadController::OnDownloadUpdated(DownloadItem* item) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (item->IsDangerous() && (item->GetState() != DownloadItem::CANCELLED))
+  if (item->IsDangerous() && (item->GetState() != DownloadItem::CANCELLED)) {
+    // Dont't show notification for a dangerous download, as user can resume
+    // the download after browser crash through notification.
     OnDangerousDownload(item);
+    return;
+  }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jguid =
       ConvertUTF8ToJavaString(env, item->GetGuid());
   ScopedJavaLocalRef<jstring> jurl =
       ConvertUTF8ToJavaString(env, item->GetURL().spec());
   ScopedJavaLocalRef<jstring> jmime_type =
       ConvertUTF8ToJavaString(env, item->GetMimeType());
   ScopedJavaLocalRef<jstring> jpath =
       ConvertUTF8ToJavaString(env, item->GetTargetFilePath().value());
@@ skipping 55 matching lines @@
           item->GetBrowserContext()->IsOffTheRecord());
       item->RemoveObserver(this);
       break;
     case DownloadItem::MAX_DOWNLOAD_STATE:
       NOTREACHED();
   }
 }
 
 void DownloadController::OnDangerousDownload(DownloadItem* item) {
   WebContents* web_contents = item->GetWebContents();
-  if (!web_contents)
+  if (!web_contents) {
+    item->Remove();
     return;
-  ChromeDownloadDelegate::FromWebContents(web_contents)->OnDangerousDownload(
-      item->GetTargetFilePath().BaseName().value(), item->GetGuid());
+  }
+
+  DangerousDownloadInfoBarDelegate::Create(
+        InfoBarService::FromWebContents(web_contents), item);
 }
 
 DownloadController::JavaObject*
     DownloadController::GetJavaObject() {
   if (!java_object_) {
     // Initialize Java DownloadController by calling
     // DownloadController.getInstance(), which will call Init()
     // if Java DownloadController is not instantiated already.
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_DownloadController_getInstance(env);
   }
 
   DCHECK(java_object_);
   return java_object_;
 }
 
 void DownloadController::StartContextMenuDownload(
     const ContextMenuParams& params, WebContents* web_contents, bool is_link,
     const std::string& extra_headers) {
   int process_id = web_contents->GetRenderProcessHost()->GetID();
   int routing_id = web_contents->GetRoutingID();
   AcquireFileAccessPermission(
       web_contents, base::Bind(&CreateContextMenuDownload, process_id,
                                routing_id, params, is_link, extra_headers));
 }
 
-void DownloadController::DangerousDownloadValidated(
-    WebContents* web_contents,
-    const std::string& download_guid,
-    bool accept) {
-  if (!web_contents)
-    return;
-  DownloadManager* dlm =
-      BrowserContext::GetDownloadManager(web_contents->GetBrowserContext());
-  DownloadItem* item = dlm->GetDownloadByGuid(download_guid);
-  if (!item)
-    return;
-  if (accept) {
-    item->ValidateDangerousDownload();
-  } else {
-    DownloadController::RecordDownloadCancelReason(
-        DownloadController::CANCEL_REASON_DANGEROUS_DOWNLOAD_INFOBAR_DISMISSED);
-    item->Remove();
-  }
-}