[Android Webapps] Make AddToHomescreenDataFetcher easier to test

chrome/browser/android/webapps/add_to_homescreen_manager.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/webapps/add_to_homescreen_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
@@ skipping 78 matching lines @@
 
 void AddToHomescreenManager::Start(content::WebContents* web_contents) {
   bool check_webapk_compatible = false;
   if (ChromeWebApkHost::CanInstallWebApk() &&
       InstallableManager::IsContentSecure(web_contents)) {
     check_webapk_compatible = true;
   } else {
     ShowDialog();
   }
 
-  data_fetcher_ = new AddToHomescreenDataFetcher(
+  data_fetcher_ = base::MakeUnique<AddToHomescreenDataFetcher>(
       web_contents, ShortcutHelper::GetIdealHomescreenIconSizeInPx(),
       ShortcutHelper::GetMinimumHomescreenIconSizeInPx(),
       ShortcutHelper::GetIdealSplashImageSizeInPx(),
       ShortcutHelper::GetMinimumSplashImageSizeInPx(),
       ShortcutHelper::GetIdealBadgeIconSizeInPx(), kDataTimeoutInMilliseconds,
       check_webapk_compatible, this);
 }
 
-AddToHomescreenManager::~AddToHomescreenManager() {
-  if (data_fetcher_) {
-    data_fetcher_->set_weak_observer(nullptr);
-    data_fetcher_ = nullptr;
-  }
-}
+AddToHomescreenManager::~AddToHomescreenManager() {}
 
 void AddToHomescreenManager::ShowDialog() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AddToHomescreenManager_showDialog(env, java_ref_);
 }
 
 void AddToHomescreenManager::RecordAddToHomescreen() {
   // Record that the shortcut has been added, so no banners will be shown
   // for this app.
   content::WebContents* web_contents = data_fetcher_->web_contents();
@@ skipping 57 matching lines @@
     const SkBitmap& badge_icon) {
   content::WebContents* web_contents = data_fetcher_->web_contents();
   banners::AppBannerManagerAndroid* app_banner_manager =
       banners::AppBannerManagerAndroid::FromWebContents(web_contents);
   banners::AppBannerInfoBarDelegateAndroid::Create(
       web_contents, app_banner_manager->GetWeakPtr(),
       base::MakeUnique<ShortcutInfo>(info), primary_icon, badge_icon,
       -1 /* event_request_id */, true /* is_webapk */,
       webapk::INSTALL_SOURCE_MENU);
 }
-
-SkBitmap AddToHomescreenManager::FinalizeLauncherIconInBackground(
-    const SkBitmap& bitmap,
-    const GURL& url,
-    bool* is_generated) {
-  base::ThreadRestrictions::AssertIOAllowed();
-
-  return ShortcutHelper::FinalizeLauncherIconInBackground(bitmap, url,
-                                                          is_generated);
-}