Break out manifest icon logic from ShortcutHelper

chrome/browser/android/banners/app_banner_manager.cc

Index: chrome/browser/android/banners/app_banner_manager.cc
diff --git a/chrome/browser/android/banners/app_banner_manager.cc b/chrome/browser/android/banners/app_banner_manager.cc
index 316a036d4277724cd41664d716715645e759c14c..7cc4f8c113f6285ad7e8b053136b1b87774abd1b 100644
--- a/chrome/browser/android/banners/app_banner_manager.cc
+++ b/chrome/browser/android/banners/app_banner_manager.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
 #include "chrome/browser/android/banners/app_banner_metrics_ids.h"
 #include "chrome/browser/android/banners/app_banner_utilities.h"
+#include "chrome/browser/android/manifest_icon_selector.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ -139,17 +140,12 @@ void AppBannerManager::OnDidGetManifest(const content::Manifest& manifest) {
   // Create an infobar to promote the manifest's app.
   manifest_ = manifest;
 
-  /* TODO(dfalcantara): Use after landing https://crrev.com/880203004.
   GURL icon_url =
       ManifestIconSelector::FindBestMatchingIcon(manifest.icons,
                                                  GetPreferredIconSize(),
                                                  web_contents());
   if (icon_url.is_empty())
     return;
-  */
-  if (manifest.icons.empty())
-    return;
-  GURL icon_url = manifest.icons.back().src;
 
   FetchIcon(icon_url);
 }