Reload favicon from HTTP cache on Ctrl+Refresh

chrome/browser/favicon/favicon_handler.h

Index: chrome/browser/favicon/favicon_handler.h
diff --git a/chrome/browser/favicon/favicon_handler.h b/chrome/browser/favicon/favicon_handler.h
index 9af7de86768ac888d538ffef92885d22f38d8592..b3b94d6be6fb8b4b36017902e6013c39d5aa75fd 100644
--- a/chrome/browser/favicon/favicon_handler.h
+++ b/chrome/browser/favicon/favicon_handler.h
@@ -148,7 +148,9 @@ class FaviconHandler {
   virtual bool ShouldSaveFavicon(const GURL& url);
 
  private:
-  friend class TestFaviconHandler; // For testing
+  // For testing:
+  friend class FaviconTabHelperTest;
+  friend class TestFaviconHandler;
 
   // Represents an in progress download of an image from the renderer.
   struct DownloadRequest {
@@ -257,7 +259,10 @@ class FaviconHandler {
   // URL of the page we're requesting the favicon for.
   GURL url_;
 
-  // Whether we got the initial response for the favicon back from the renderer.
+  // Whether we are waiting for data from the FaviconService.
+  bool waiting_for_favicon_service_data_;
+
+  // Whether we got data back for the initial request to the FaviconService.
   bool got_favicon_from_history_;
 
   // Whether the favicon is out of date or the favicon data in