Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

chrome/browser/favicon/favicon_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 82 matching lines @@
 
   // Message Handler.  Must be public, because also called from
   // PrerenderContents. Collects the |image_urls| list.
   void OnUpdateFaviconURL(int32 page_id,
                           const std::vector<content::FaviconURL>& candidates);
 
   // Processes the current image_irls_ entry, requesting the image from the
   // history / download service.
   void ProcessCurrentUrl();
 
-  // Message handler for IconHostMsg_DidDownloadFavicon. Called when the icon
+  // Message handler for ImageHostMsg_DidDownloadImage. Called when the image
   // at |image_url| has been downloaded.
-  // |bitmaps| is a list of all the frames of the icon at |image_url|.
+  // |bitmaps| is a list of all the frames of the image at |image_url|.
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
                             int requested_size,
                             const std::vector<SkBitmap>& bitmaps);
 
   // For testing.
   const std::deque<content::FaviconURL>& image_urls() const {
     return image_urls_;
   }
 
@@ skipping 162 matching lines @@
   // This handler's delegate.
   FaviconHandlerDelegate* delegate_;  // weak
 
   // Current favicon candidate.
   FaviconCandidate favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_