[Offline pages] Making sure that destroying the bridge does not leave notification hanging

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 "base/guid.h"
@@ skipping 49 matching lines @@
       ConvertUTF8ToJavaString(env, item.target_path.value()),
       item.start_time.ToJavaTime(), item.total_bytes);
 }
 }  // namespace
 
 OfflinePageDownloadBridge::OfflinePageDownloadBridge(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     DownloadUIAdapter* download_ui_adapter)
     : weak_java_ref_(env, obj),
-      download_ui_adapter_(download_ui_adapter),
-      weak_ptr_factory_(this) {
+      download_ui_adapter_(download_ui_adapter) {
   DCHECK(download_ui_adapter_);
   download_ui_adapter_->AddObserver(this);
 }
 
 OfflinePageDownloadBridge::~OfflinePageDownloadBridge() {}
 
 // static
 bool OfflinePageDownloadBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+// static
+void OfflinePageDownloadBridge::SavePageCallback(
+    const DownloadUIItem& item,
+    OfflinePageModel::SavePageResult result,
+    int64_t offline_id) {
+  OfflinePageNotificationBridge notification_bridge;
+  if (result == SavePageResult::SUCCESS)
+    notification_bridge.NotifyDownloadSuccessful(item);
+  else
+    notification_bridge.NotifyDownloadFailed(item);
+}
+
 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) {
@@ skipping 60 matching lines @@
 
   DownloadUIItem item;
   item.guid = client_id.id;
   item.url = url;
 
   OfflinePageNotificationBridge bridge;
   bridge.NotifyDownloadProgress(item);
 
   offline_page_model->SavePage(
       url, client_id, 0ul, std::move(archiver),
-      base::Bind(&OfflinePageDownloadBridge::SavePageCallback,
-                 weak_ptr_factory_.GetWeakPtr(), item));
+      base::Bind(&OfflinePageDownloadBridge::SavePageCallback, item));
 }
 
 void OfflinePageDownloadBridge::ItemsLoaded() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_OfflinePageDownloadBridge_downloadItemsLoaded(env, obj);
 }
 
@@ skipping 17 matching lines @@
 
 void OfflinePageDownloadBridge::ItemUpdated(const DownloadUIItem& item) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_OfflinePageDownloadBridge_downloadItemUpdated(
       env, obj, ToJavaOfflinePageDownloadItem(env, item));
 }
 
-void OfflinePageDownloadBridge::SavePageCallback(
-    const DownloadUIItem& item,
-    OfflinePageModel::SavePageResult result,
-    int64_t offline_id) {
-  OfflinePageNotificationBridge notification_bridge;
-  if (result == SavePageResult::SUCCESS)
-    notification_bridge.NotifyDownloadSuccessful(item);
-  else
-    notification_bridge.NotifyDownloadFailed(item);
-}
-
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& j_profile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
   OfflinePageModel* offline_page_model =
       OfflinePageModelFactory::GetForBrowserContext(profile);
 
   DownloadUIAdapter* adapter =
       DownloadUIAdapter::FromOfflinePageModel(offline_page_model);
 
   return reinterpret_cast<jlong>(
       new OfflinePageDownloadBridge(env, obj, adapter));
 }
 
 }  // namespace android
 }  // namespace offline_pages