Replace AppBannerDataFetcher with InstallableManager.

chrome/browser/android/banners/app_banner_infobar_delegate_android.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/banners/app_banner_infobar_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/guid.h"
 #include "base/location.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/shortcut_info.h"
 #include "chrome/browser/android/tab_android.h"
-#include "chrome/browser/banners/app_banner_data_fetcher.h"
+#include "chrome/browser/banners/app_banner_manager.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/rappor/rappor_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/manifest.h"
 #include "jni/AppBannerInfoBarDelegateAndroid_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "url/gurl.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 
 namespace banners {
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
-    int event_request_id,
-    scoped_refptr<AppBannerDataFetcherAndroid> data_fetcher,
+    base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
-    const GURL& app_icon_url,
-    SkBitmap* app_icon,
     const GURL& manifest_url,
-    const content::Manifest& manifest)
-    : data_fetcher_(data_fetcher),
+    const content::Manifest& manifest,
+    const GURL& icon_url,
+    std::unique_ptr<SkBitmap> icon,
+    int event_request_id)
+    : weak_manager_(weak_manager),
       app_title_(app_title),
-      app_icon_url_(app_icon_url),
-      app_icon_(app_icon),
-      event_request_id_(event_request_id),
       manifest_url_(manifest_url),
       manifest_(manifest),
+      icon_url_(icon_url),
+      icon_(std::move(icon)),
+      event_request_id_(event_request_id),
       has_user_interaction_(false) {
   DCHECK(!manifest.IsEmpty());
   CreateJavaDelegate();
 }
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
-    int event_request_id,
     const base::string16& app_title,
-    SkBitmap* app_icon,
     const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
+    std::unique_ptr<SkBitmap> icon,
     const std::string& native_app_package,
-    const std::string& referrer)
+    const std::string& referrer,
+    int event_request_id)
     : app_title_(app_title),
-      app_icon_(app_icon),
-      event_request_id_(event_request_id),
       native_app_data_(native_app_data),
+      icon_(std::move(icon)),
       native_app_package_(native_app_package),
       referrer_(referrer),
+      event_request_id_(event_request_id),
       has_user_interaction_(false) {
   DCHECK(!native_app_data_.is_null());
   CreateJavaDelegate();
 }
 
 AppBannerInfoBarDelegateAndroid::~AppBannerInfoBarDelegateAndroid() {
   if (!has_user_interaction_) {
     if (!native_app_data_.is_null())
       TrackUserResponse(USER_RESPONSE_NATIVE_APP_IGNORED);
     else if (!manifest_.IsEmpty())
@@ skipping 32 matching lines @@
       InfoBarService::WebContentsFromInfoBar(infobar());
   if (!web_contents)
     return;
 
   if (jis_installing) {
     AppBannerSettingsHelper::RecordBannerEvent(
         web_contents,
         web_contents->GetURL(),
         native_app_package_,
         AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
-        AppBannerDataFetcher::GetCurrentTime());
+        AppBannerManager::GetCurrentTime());
 
     TrackInstallEvent(INSTALL_EVENT_NATIVE_APP_INSTALL_STARTED);
     rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                             "AppBanner.NativeApp.Installed",
                                             web_contents->GetURL());
   }
 
   UpdateInstallState(env, obj);
 }
 
@@ skipping 29 matching lines @@
           event_request_id_,
           platform));
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 AppBannerInfoBarDelegateAndroid::GetIdentifier() const {
   return APP_BANNER_INFOBAR_DELEGATE_ANDROID;
 }
 
 gfx::Image AppBannerInfoBarDelegateAndroid::GetIcon() const {
-  return gfx::Image::CreateFrom1xBitmap(*app_icon_.get());
+  return gfx::Image::CreateFrom1xBitmap(*icon_.get());
 }
 
 void AppBannerInfoBarDelegateAndroid::InfoBarDismissed() {
   has_user_interaction_ = true;
 
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
   if (!web_contents)
     return;
 
@@ skipping 61 matching lines @@
   } else if (!manifest_.IsEmpty()) {
     TrackUserResponse(USER_RESPONSE_WEB_APP_ACCEPTED);
 
     AppBannerSettingsHelper::RecordBannerInstallEvent(
         web_contents, manifest_.start_url.spec(),
         AppBannerSettingsHelper::WEB);
 
     ShortcutInfo info(GURL::EmptyGURL());
     info.UpdateFromManifest(manifest_);
     info.manifest_url = manifest_url_;
-    info.icon_url = app_icon_url_;
+    info.icon_url = icon_url_;
     info.UpdateSource(ShortcutInfo::SOURCE_APP_BANNER);
 
     const std::string& uid = base::GenerateGUID();
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&ShortcutHelper::AddToLauncherInBackgroundWithSkBitmap, info,
-                   uid, *app_icon_.get(),
-                   data_fetcher_->FetchWebappSplashScreenImageCallback(uid)));
+                   uid, *icon_.get(),
+                   weak_manager_->FetchWebappSplashScreenImageCallback(uid)));

[gone, 2016/08/03 19:33:08]

Don't you need to check if the weak pointer is still valid before using it?

[dominickn, 2016/08/04 02:51:07]

Done.

 
     SendBannerAccepted(web_contents, "web");
     return true;
   }
 
   return true;
 }
 
 bool AppBannerInfoBarDelegateAndroid::LinkClicked(
     WindowOpenDisposition disposition) {
@@ skipping 19 matching lines @@
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) {
  return RegisterNativesImpl(env);
 }
 
 }  // namespace banners