Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

chrome/browser/ui/ash/launcher/launcher_favicon_loader.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/ash/launcher/launcher_favicon_loader.h"
 
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 91 matching lines @@
     bitmap_.reset();
   }
   // Request any new urls.
   for (std::set<GURL>::iterator iter = urls.begin();
        iter != urls.end(); ++iter) {
     if (processed_requests_.find(*iter) != processed_requests_.end())
       continue;  // Skip already processed downloads.
     if (pending_requests_.find(*iter) != pending_requests_.end())
       continue;  // Skip already pending downloads.
     pending_requests_.insert(*iter);
-    web_contents_->DownloadFavicon(*iter, 0,
+    web_contents_->DownloadImage(*iter, 0,
         base::Bind(&FaviconBitmapHandler::DidDownloadFavicon,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 bool FaviconBitmapHandler::HasPendingDownloads() const {
   return !pending_requests_.empty();
 }
 
 void FaviconBitmapHandler::DidDownloadFavicon(
@@ skipping 45 matching lines @@
 LauncherFaviconLoader::~LauncherFaviconLoader() {
 }
 
 SkBitmap LauncherFaviconLoader::GetFavicon() const {
   return favicon_handler_->bitmap();
 }
 
 bool LauncherFaviconLoader::HasPendingDownloads() const {
   return favicon_handler_->HasPendingDownloads();
 }