Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

chrome/browser/ui/web_applications/web_app_ui.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/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 152 matching lines @@
     DeleteMe();  // We are done if underlying WebContents is gone.
     return;
   }
 
   if (unprocessed_icons_.empty()) {
     // No app icon. Just use the favicon from WebContents.
     UpdateShortcuts();
     return;
   }
 
-  web_contents_->DownloadFavicon(
+  web_contents_->DownloadImage(
       unprocessed_icons_.back().url,
       std::max(unprocessed_icons_.back().width,
                unprocessed_icons_.back().height),
       base::Bind(&UpdateShortcutWorker::DidDownloadFavicon,
                  base::Unretained(this)));
   unprocessed_icons_.pop_back();
 }
 
 void UpdateShortcutWorker::DidDownloadFavicon(
     int id,
@@ skipping 252 matching lines @@
   }
 
   // |info_list| may still be empty at this point, in which case LoadImage
   // will call the OnImageLoaded callback with an empty image and exit
   // immediately.
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list,
       base::Bind(&OnImageLoaded, shortcut_info, callback));
 }
 
 }  // namespace web_app