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 55656a660b1f780fe776e7f1a7cd4d3e77f88618..69bbeccc7002ac900c80f83c89df0d19f5da36eb 100644
--- a/chrome/browser/favicon/favicon_handler.h
+++ b/chrome/browser/favicon/favicon_handler.h
@@ -113,6 +113,12 @@ class FaviconHandler {
     return image_urls_;
   }
 
+  // For testing. Returns whether there are any pending FaviconService requests.

[sky, 2015/02/19 18:08:10]

This class already has a friend for testing, can you access what you need via
the friend?

[pkotwicz, 2015/02/19 21:29:57]

Thanks for the suggestion. FaviconHandler now has two friends.

+  bool HasPendingFaviconServiceRequestsForTest() const;
+
+  // For testing. Returns whether there are any pending downloads.
+  bool HasPendingDownloadsForTest() const;
+
  protected:
   // These virtual methods make FaviconHandler testable and are overridden by
   // TestFaviconHandler.
@@ -258,7 +264,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