Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

chrome/browser/ui/views/create_application_shortcut_view.cc

 // Copyright (c) 2012 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/ui/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 472 matching lines @@
   return true;
 }
 
 void CreateUrlApplicationShortcutView::FetchIcon() {
   // There should only be fetch job at a time.
   DCHECK_EQ(-1, pending_download_id_);
 
   if (unprocessed_icons_.empty())  // No icons to fetch.
     return;
 
-  pending_download_id_ = web_contents_->DownloadFavicon(
+  pending_download_id_ = web_contents_->DownloadImage(
       unprocessed_icons_.back().url,
       std::max(unprocessed_icons_.back().width,
                unprocessed_icons_.back().height),
       base::Bind(&CreateUrlApplicationShortcutView::DidDownloadFavicon,
                  base::Unretained(this)));
 
   unprocessed_icons_.pop_back();
 }
 
 void CreateUrlApplicationShortcutView::DidDownloadFavicon(
@@ skipping 49 matching lines @@
 CreateChromeApplicationShortcutView::~CreateChromeApplicationShortcutView() {}
 
 // Called when the app's ShortcutInfo (with icon) is loaded.
 void CreateChromeApplicationShortcutView::OnShortcutInfoLoaded(
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   shortcut_info_ = shortcut_info;
 
   CHECK(app_info_);
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }