Implement manifest icon downloader

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.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_data_fetcher.h"
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
+#include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/web_application_info.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/favicon/core/favicon_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 82 matching lines @@
   if (!manifest.IsEmpty()) {
       content::RecordAction(
           base::UserMetricsAction("webapps.AddShortcut.Manifest"));
       shortcut_info_.UpdateFromManifest(manifest);
   }
 
   GURL icon_src = ManifestIconSelector::FindBestMatchingIcon(
       manifest.icons,
       kPreferredIconSizeInDp,
       gfx::Screen::GetScreenFor(web_contents()->GetNativeView()));
-  if (icon_src.is_valid()) {
-    // Grab the best icon from the manifest.
-    web_contents()->DownloadImage(
+
+  // If fetching the Manifest icon fails, fallback to the best favicon
+  // for the page.
+  if (!ManifestIconDownloader::Download(
+        web_contents(),
         icon_src,
-        false,
-        preferred_icon_size_in_px_,
-        false,
+        kPreferredIconSizeInDp,
         base::Bind(&AddToHomescreenDataFetcher::OnManifestIconFetched,
-                   this));
-  } else {
-    // Grab the best favicon for the page.
+                   this))) {
     FetchFavicon();
   }
 
   weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
   // Kick off a timeout for downloading the icon.  If an icon isn't set within
   // the timeout, fall back to using a dynamically-generated launcher icon.
   icon_timeout_timer_.Start(FROM_HERE,
                             base::TimeDelta::FromMilliseconds(3000),
                             base::Bind(
@@ skipping 44 matching lines @@
   favicon_service->GetLargestRawFaviconForPageURL(
       shortcut_info_.url,
       icon_types,
       threshold_to_get_any_largest_icon,
       base::Bind(&AddToHomescreenDataFetcher::OnFaviconFetched, this),
       &favicon_task_tracker_);
 }
 
 void AddToHomescreenDataFetcher::OnFaviconFetched(
     const favicon_base::FaviconRawBitmapResult& bitmap_result) {
-  if (!web_contents() || !weak_observer_ || is_icon_saved_) {
+  if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
-  }
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&AddToHomescreenDataFetcher::CreateLauncherIcon,
                  this,
                  bitmap_result));
 }
 
 void AddToHomescreenDataFetcher::CreateLauncherIcon(
@@ skipping 14 matching lines @@
   }
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&AddToHomescreenDataFetcher::NotifyObserver,
                  this,
                  icon_bitmap));
 }
 
-void AddToHomescreenDataFetcher::OnManifestIconFetched(
-    int id,
-    int http_status_code,
-    const GURL& url,
-    const std::vector<SkBitmap>& bitmaps,
-    const std::vector<gfx::Size>& sizes) {
-  if (!web_contents() || !weak_observer_) return;
-
-  // If getting the candidate manifest icon failed, the ShortcutHelper should
-  // fallback to the favicon.
-  // Otherwise, it sets the state as if there was no manifest icon pending.
-  if (bitmaps.empty()) {
+void AddToHomescreenDataFetcher::OnManifestIconFetched(const SkBitmap& icon) {
+  if (icon.drawsNothing()) {
     FetchFavicon();
     return;
   }
-
-  // There might be multiple bitmaps returned. The one to pick is bigger or
-  // equal to the preferred size. |bitmaps| is ordered from bigger to smaller.
-  int preferred_bitmap_index = 0;
-  for (size_t i = 0; i < bitmaps.size(); ++i) {
-    if (bitmaps[i].height() < preferred_icon_size_in_px_)
-      break;
-    preferred_bitmap_index = i;
-  }
-
-  NotifyObserver(bitmaps[preferred_bitmap_index]);
+  NotifyObserver(icon);
 }
 
 void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
   shortcut_icon_ = bitmap;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
 }