Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

chrome/browser/ui/metro_pin_tab_helper_win.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/metro_pin_tab_helper_win.h"
 
 #include <set>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 382 matching lines @@
     return;
   }
 
   // Request all the candidates.
   int image_size = 0; // Request the full sized image.
   for (std::vector<content::FaviconURL>::const_iterator iter =
            favicon_url_candidates_.begin();
        iter != favicon_url_candidates_.end();
        ++iter) {
     favicon_chooser_->AddPendingRequest(
-        web_contents()->DownloadFavicon(iter->icon_url, image_size,
+        web_contents()->DownloadImage(iter->icon_url, image_size,
             base::Bind(&MetroPinTabHelper::DidDownloadFavicon,
                        base::Unretained(this))));
   }
 
 }
 
 void MetroPinTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& /*details*/,
     const content::FrameNavigateParams& /*params*/) {
   // Cancel any outstanding pin operations once the user navigates away from
@@ skipping 35 matching lines @@
 
   GURL url = web_contents()->GetURL();
   string16 tile_id = GenerateTileId(UTF8ToUTF16(url.spec()));
   metro_un_pin_from_start_screen(tile_id,
                                  base::Bind(&PinPageReportUmaCallback));
 }
 
 void MetroPinTabHelper::FaviconDownloaderFinished() {
   favicon_chooser_.reset();
 }