Reload favicon from HTTP cache on Ctrl+Refresh

chrome/browser/favicon/favicon_tab_helper.h

Index: chrome/browser/favicon/favicon_tab_helper.h
diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h
index 97ed230c5ab1acc01811d66ae54f4fe9cb0ecd43..f3c3cb96527918f3491cf8278b17c24baf14b3a6 100644
--- a/chrome/browser/favicon/favicon_tab_helper.h
+++ b/chrome/browser/favicon/favicon_tab_helper.h
@@ -95,8 +95,10 @@ class FaviconTabHelper : public content::WebContentsObserver,
       const std::vector<gfx::Size>& original_bitmap_sizes);
 
  private:
-  explicit FaviconTabHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<FaviconTabHelper>;
+  friend class FaviconTabHelperTest;
+
+  explicit FaviconTabHelper(content::WebContents* web_contents);
 
   // content::WebContentsObserver overrides.
   void DidStartNavigationToPendingEntry(
@@ -125,6 +127,9 @@ class FaviconTabHelper : public content::WebContentsObserver,
 
   std::vector<content::FaviconURL> favicon_urls_;
 
+  // Bypass cache when downloading favicons for this page URL.
+  GURL bypass_cache_page_url_;
+
   scoped_ptr<FaviconHandler> favicon_handler_;
 
   // Handles downloading touchicons. It is NULL if