Factoring out of FaviconLoader

chrome/browser/ui/intents/web_intent_picker_controller.h

Index: chrome/browser/ui/intents/web_intent_picker_controller.h
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.h b/chrome/browser/ui/intents/web_intent_picker_controller.h
index 9a2d2ccc7439ff9b710b4171e13b3c106b18c634..e6209bbf0e6a91906612671a999d739e1c61d4b5 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.h
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.h
@@ -13,7 +13,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/extensions/webstore_installer.h"
-#include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/intents/cws_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_reporting.h"
@@ -38,6 +37,7 @@ class WebIntentsDispatcher;
 
 namespace web_intents {
 class NativeServiceFactory;
+class IconLoader;
 }
 
 namespace webkit_glue {
@@ -207,11 +207,6 @@ class WebIntentPickerController
   void OnWebIntentServicesAvailableForExplicitIntent(
       const std::vector<webkit_glue::WebIntentServiceData>& services);
 
-  // Called when a favicon is returned from the FaviconService.
-  void OnFaviconDataAvailable(
-      FaviconService::Handle handle,
-      const history::FaviconImageResult& image_result);
-
   // Called when IntentExtensionInfo is returned from the CWSIntentsRegistry.
   void OnCWSIntentServicesAvailable(
       const CWSIntentsRegistry::IntentExtensionList& extensions);
@@ -341,8 +336,8 @@ class WebIntentPickerController
   // close it when a reply is sent.
   content::WebContents* service_tab_;
 
-  // Request consumer used when asynchronously loading favicons.
-  CancelableRequestConsumerTSimple<size_t> favicon_consumer_;
+  // Object managing the details of icon loading.

[James Hawkins, 2012/10/17 03:38:39]

Object that manages the details...

+  scoped_ptr<web_intents::IconLoader> icon_loader_;
 
   // Factory for weak pointers used in callbacks for async calls to load the
   // picker model.