Reload favicon from HTTP cache on Ctrl+Refresh

chrome/browser/favicon/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 CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 
 #include <deque>
 #include <map>
 #include <vector>
@@ skipping 95 matching lines @@
       int id,
       const GURL& image_url,
       const std::vector<SkBitmap>& bitmaps,
       const std::vector<gfx::Size>& original_bitmap_sizes);
 
   // For testing.
   const std::vector<favicon::FaviconURL>& image_urls() const {
     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.
 
   // Asks the render to download favicon, returns the request id.
   virtual int DownloadFavicon(const GURL& image_url, int max_bitmap_size);
 
   // Ask the favicon from history
   virtual void UpdateFaviconMappingAndFetch(
       const GURL& page_url,
@@ skipping 125 matching lines @@
   // Additionally removes any entries whose sizes are all greater than the max
   // allowed size.
   void SortAndPruneImageUrls();
 
   // Used for FaviconService requests.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // 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
   // |history_results_| is known to be incomplete. If true, it means history
   // knows about the favicon, but we need to download the favicon because the
   // icon has expired or the data in the database is incomplete.
   bool favicon_expired_or_incomplete_;
 
   // Requests to the renderer to download favicons.
   typedef std::map<int, DownloadRequest> DownloadRequests;
@@ skipping 20 matching lines @@
   // Best image we've seen so far.  As images are downloaded from the page they
   // are stored here. When there is an exact match, or no more images are
   // 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);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_