Make ProcessCurrentUrl() and OnFaviconDataForInitialURLFromFaviconService() share code

components/favicon/core/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 COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
 #define COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 79 matching lines @@
   static int GetIconTypesFromHandlerType(Type icon_type);
 
   // Initiates loading the favicon for the specified url.
   void FetchFavicon(const GURL& url);
 
   // Message Handler.  Must be public, because also called from
   // PrerenderContents. Collects the |image_urls| list.
   void OnUpdateFaviconURL(const GURL& page_url,
                           const std::vector<favicon::FaviconURL>& candidates);
 
-  // Processes the current image_urls_ entry, requesting the image from the
-  // history / download service.
-  void ProcessCurrentUrl();
+  // Called when the history request for favicon data mapped to |url_| has
+  // completed and the renderer has told us the icon URLs used by |url_|
+  void OnGotInitialHistoryDataAndIconURLCandidates();
 
   // 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 image at |image_url|.
   // |original_bitmap_sizes| are the sizes of |bitmaps| before they were resized
   // to the maximum bitmap size passed to DownloadFavicon().
   void OnDidDownloadFavicon(
       int id,
       const GURL& image_url,
       const std::vector<SkBitmap>& bitmaps,
@@ skipping 75 matching lines @@
   };
 
   // Get the maximal icon size in pixels for a icon of type |icon_type| for the
   // current platform.
   static int GetMaximalIconSize(favicon_base::IconType icon_type);
 
   // See description above class for details.
   void OnFaviconDataForInitialURLFromFaviconService(const std::vector<
       favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results);
 
-  // If the favicon has expired, asks the renderer to download the favicon.
-  // Otherwise asks history to update the mapping between page url and icon
-  // url with a callback to OnFaviconData when done.
-  void DownloadFaviconOrAskFaviconService(const GURL& icon_url,
-                                          favicon_base::IconType icon_type);
+  // If the favicon currently mapped to |url_| has expired, downloads the
+  // current candidate favicon from the renderer. Otherwise requests data for
+  // the current favicon from history. If data is requested from history,
+  // OnFaviconData() is called with the history data once it has been retrieved.
+  void DownloadCurrentCandidateOrAskFaviconService();
 
   // See description above class for details.
   void OnFaviconData(const std::vector<favicon_base::FaviconRawBitmapResult>&
                          favicon_bitmap_results);
 
   // Schedules a download for the specified entry. This adds the request to
   // download_requests_.
   void ScheduleDownload(const GURL& image_url,
                         favicon_base::IconType icon_type);
 
@@ skipping 81 matching lines @@
   // available the favicon service and the current page are updated (assuming
   // the image is for a favicon).
   FaviconCandidate best_favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_