Reload favicon from HTTP cache on Ctrl+Refresh

chrome/browser/favicon/favicon_tab_helper.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_TAB_HELPER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 77 matching lines @@
 
   // Favicon download callback.
   void DidDownloadFavicon(
       int id,
       int http_status_code,
       const GURL& image_url,
       const std::vector<SkBitmap>& bitmaps,
       const std::vector<gfx::Size>& original_bitmap_sizes);
 
  private:
+  friend class content::WebContentsUserData<FaviconTabHelper>;
+  friend class FaviconTabHelperTest;
+
   explicit FaviconTabHelper(content::WebContents* web_contents);
-  friend class content::WebContentsUserData<FaviconTabHelper>;
 
   // content::WebContentsObserver overrides.
   void DidStartNavigationToPendingEntry(
       const GURL& url,
       content::NavigationController::ReloadType reload_type) override;
   void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
 
   // Sets whether the page's favicon is valid (if false, the default favicon is
   // being used). Requires GetActiveURL() to be valid.
   void SetActiveFaviconValidity(bool validity);
 
   // Sets the URL of the favicon's bitmap.
   void SetActiveFaviconURL(GURL url);
 
   // Sets the bitmap of the current page's favicon.
   void SetActiveFaviconImage(gfx::Image image);
 
   // Helper method that returns the active navigation entry's favicon.
   content::FaviconStatus& GetFaviconStatus();
 
   Profile* profile_;
 
   FaviconClient* client_;
 
   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
   // browser_defaults::kEnableTouchIcon is false.
   scoped_ptr<FaviconHandler> touch_icon_handler_;
 
   ObserverList<FaviconTabHelperObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconTabHelper);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_