Expire favicons which were added with default favicon sizes

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 <map>
 
 #include "base/basictypes.h"
@@ skipping 254 matching lines @@
   // Used for history requests.
   CancelableRequestConsumer cancelable_consumer_;
 
   // 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.
   // See "Favicon Details" in tab_contents.cc for more details.
   bool got_favicon_from_history_;
 
-  // Whether the favicon is out of date. If true, it means history knows about
-  // the favicon, but we need to download the favicon because the icon has
-  // expired.
-  // See "Favicon Details" in tab_contents.cc for more details.
-  bool favicon_expired_;
+  // 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;
   DownloadRequests download_requests_;
 
   // The combination of the supported icon types.
   const int icon_types_;
 
   // The prioritized favicon candidates from the page back from the renderer.
   std::deque<FaviconURL> image_urls_;
 
   // The FaviconBitmapResults from history.
   std::vector<history::FaviconBitmapResult> history_results_;
 
   // The Profile associated with this handler.
   Profile* profile_;
 
   // This handler's delegate.
   FaviconHandlerDelegate* delegate_;  // weak
 
   // Current favicon candidate.
   FaviconCandidate favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_