Remove DownloadController java weak reference

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/jni_android.h"
@@ skipping 90 matching lines @@
   DCHECK_NE(interrupt_reason, content::DOWNLOAD_INTERRUPT_REASON_NONE);
   return
       interrupt_reason == content::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT ||
       interrupt_reason == content::DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED ||
       interrupt_reason ==
           content::DOWNLOAD_INTERRUPT_REASON_NETWORK_DISCONNECTED;
 }
 
 }  // namespace
 
-// JNI methods
-static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
-  DownloadController::GetInstance()->Init(env, obj);
-}
-
 static void OnAcquirePermissionResult(
     JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jclass>& clazz,
     jlong callback_id,
     jboolean granted,
     const JavaParamRef<jstring>& jpermission_to_update) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(callback_id);
 
   std::string permission_to_update =
       base::android::ConvertJavaStringToUTF8(env, jpermission_to_update);
   // Convert java long long int to c++ pointer, take ownership.
   std::unique_ptr<DownloadController::AcquirePermissionCallback> cb(
@@ skipping 20 matching lines @@
     return;
   }
 
   if (!granted) {
     DownloadController::RecordDownloadCancelReason(
         DownloadController::CANCEL_REASON_NO_STORAGE_PERMISSION);
   }
   cb.Run(granted);
 }
 
-struct DownloadController::JavaObject {
-  ScopedJavaLocalRef<jobject> Controller(JNIEnv* env) {
-    return GetRealObject(env, obj_);
-  }
-  jweak obj_;
-};
-
 // static
 bool DownloadController::RegisterDownloadController(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 DownloadControllerBase* DownloadControllerBase::Get() {
   base::AutoLock lock(g_download_controller_lock_.Get());
   if (!DownloadControllerBase::download_controller_)
     download_controller_ = DownloadController::GetInstance();
@@ skipping 12 matching lines @@
     DownloadCancelReason reason) {
   UMA_HISTOGRAM_ENUMERATION(
       "MobileDownload.CancelReason", reason, CANCEL_REASON_MAX);
 }
 
 // static
 DownloadController* DownloadController::GetInstance() {
   return base::Singleton<DownloadController>::get();
 }
 
-DownloadController::DownloadController()
-    : java_object_(NULL) {
-}
+DownloadController::DownloadController() = default;
 
-DownloadController::~DownloadController() {
-  if (java_object_) {
-    JNIEnv* env = base::android::AttachCurrentThread();
-    env->DeleteWeakGlobalRef(java_object_->obj_);
-    delete java_object_;
-    base::android::CheckException(env);
-  }
-}
-
-// Initialize references to Java object.
-void DownloadController::Init(JNIEnv* env, jobject obj) {
-  java_object_ = new JavaObject;
-  java_object_->obj_ = env->NewWeakGlobalRef(obj);
-}
+DownloadController::~DownloadController() = default;
 
 void DownloadController::AcquireFileAccessPermission(
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     const DownloadControllerBase::AcquireFileAccessPermissionCallback& cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (HasFileAccessPermission()) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, base::Bind(cb, true));
     return;
   }
 
   AcquirePermissionCallback callback(
       base::Bind(&OnRequestFileAccessResult, web_contents_getter, cb));
   // Make copy on the heap so we can pass the pointer through JNI.
   intptr_t callback_id =
       reinterpret_cast<intptr_t>(new AcquirePermissionCallback(callback));
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_DownloadController_requestFileAccess(
-      env, GetJavaObject()->Controller(env), callback_id);
+  Java_DownloadController_requestFileAccess(env, callback_id);
 }
 
 void DownloadController::CreateAndroidDownload(
     const content::ResourceRequestInfo::WebContentsGetter& wc_getter,
     const DownloadInfo& info) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&DownloadController::StartAndroidDownload,
@@ skipping 35 matching lines @@
   ScopedJavaLocalRef<jstring> jreferer =
       ConvertUTF8ToJavaString(env, info.referer);
   ScopedJavaLocalRef<jstring> jfile_name =
       base::android::ConvertUTF16ToJavaString(env, file_name);
   Java_DownloadController_enqueueAndroidDownloadManagerRequest(
       env, jurl, juser_agent, jfile_name, jmime_type, jcookie, jreferer);
 
   WebContents* web_contents = wc_getter.Run();
   if (web_contents) {
     TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
-    if (tab && !tab->GetJavaObject().is_null()) {
+    if (tab && !tab->GetJavaObject().is_null())
       Java_DownloadController_closeTabIfBlank(env, tab->GetJavaObject());
-    }
   }
 }
 
 bool DownloadController::HasFileAccessPermission() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   JNIEnv* env = base::android::AttachCurrentThread();
-  return Java_DownloadController_hasFileAccess(
-      env, GetJavaObject()->Controller(env));
+  return Java_DownloadController_hasFileAccess(env);
 }
 
 void DownloadController::OnDownloadStarted(
     DownloadItem* download_item) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // For dangerous item, we need to show the dangerous infobar before the
   // download can start.
   JNIEnv* env = base::android::AttachCurrentThread();
-  if (!download_item->IsDangerous()) {
-    Java_DownloadController_onDownloadStarted(
-        env, GetJavaObject()->Controller(env));
-  }
+  if (!download_item->IsDangerous())
+    Java_DownloadController_onDownloadStarted(env);
 
   WebContents* web_contents = download_item->GetWebContents();
   if (web_contents) {
     TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
     if (tab && !tab->GetJavaObject().is_null()) {
       Java_DownloadController_closeTabIfBlank(env, tab->GetJavaObject());
     }
   }
 
   // Register for updates to the DownloadItem.
   download_item->AddObserver(this);
 
   OnDownloadUpdated(download_item);
 }
 
 void DownloadController::OnDownloadUpdated(DownloadItem* item) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   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<jobject> j_item =
       DownloadManagerService::CreateJavaDownloadInfo(env, item);
   switch (item->GetState()) {
     case DownloadItem::IN_PROGRESS: {
-      Java_DownloadController_onDownloadUpdated(
-          env, GetJavaObject()->Controller(env), j_item);
+      Java_DownloadController_onDownloadUpdated(env, j_item);
       break;
     }
     case DownloadItem::COMPLETE:
       // Multiple OnDownloadUpdated() notifications may be issued while the
       // download is in the COMPLETE state. Only handle one.
       item->RemoveObserver(this);
 
       // Call onDownloadCompleted
-      Java_DownloadController_onDownloadCompleted(
-          env, GetJavaObject()->Controller(env), j_item);
+      Java_DownloadController_onDownloadCompleted(env, j_item);
       DownloadController::RecordDownloadCancelReason(
              DownloadController::CANCEL_REASON_NOT_CANCELED);
       break;
     case DownloadItem::CANCELLED:
-      Java_DownloadController_onDownloadCancelled(
-          env, GetJavaObject()->Controller(env), j_item);
+      Java_DownloadController_onDownloadCancelled(env, j_item);
       DownloadController::RecordDownloadCancelReason(
           DownloadController::CANCEL_REASON_OTHER_NATIVE_RESONS);
       break;
     case DownloadItem::INTERRUPTED:
       // When device loses/changes network, we get a NETWORK_TIMEOUT,
       // NETWORK_FAILED or NETWORK_DISCONNECTED error. Download should auto
       // resume in this case.
-      Java_DownloadController_onDownloadInterrupted(
-          env, GetJavaObject()->Controller(env), j_item,
+      Java_DownloadController_onDownloadInterrupted(env, j_item,
           IsInterruptedDownloadAutoResumable(item));
       item->RemoveObserver(this);
       break;
     case DownloadItem::MAX_DOWNLOAD_STATE:
       NOTREACHED();
   }
 }
 
 void DownloadController::OnDangerousDownload(DownloadItem* item) {
   WebContents* web_contents = item->GetWebContents();
   if (!web_contents) {
     item->Remove();
     return;
   }
 
   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->GetRenderViewHost()->GetRoutingID();
 
   const content::ResourceRequestInfo::WebContentsGetter& wc_getter(
       base::Bind(&GetWebContents, process_id, routing_id));
 
   AcquireFileAccessPermission(
       wc_getter, base::Bind(&CreateContextMenuDownload, wc_getter, params,
                             is_link, extra_headers));
 }