Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

chrome/browser/ui/extensions/shell_window.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/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/app_window_contents.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 340 matching lines @@
       !web_contents()->GetController().GetActiveEntry() ||
       web_contents()->GetController().GetActiveEntry()->GetTitle().empty())
     return UTF8ToUTF16(extension()->name());
   string16 title = web_contents()->GetTitle();
   Browser::FormatTitleForDisplay(&title);
   return title;
 }
 
 void ShellWindow::SetAppIconUrl(const GURL& url) {
   app_icon_url_ = url;
-  web_contents()->DownloadFavicon(url, kPreferredIconSize,
-                                  base::Bind(&ShellWindow::DidDownloadFavicon,
-                                             weak_ptr_factory_.GetWeakPtr()));
+  web_contents()->DownloadImage(url, kPreferredIconSize,
+                                base::Bind(&ShellWindow::DidDownloadFavicon,
+                                           weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ShellWindow::UpdateDraggableRegions(
     const std::vector<extensions::DraggableRegion>& regions) {
   native_app_window_->UpdateDraggableRegions(regions);
 }
 
 void ShellWindow::UpdateAppIcon(const gfx::Image& image) {
   if (image.IsEmpty())
     return;
@@ skipping 154 matching lines @@
     const extensions::DraggableRegion& region = *iter;
     sk_region->op(
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }