Use the default favicon in place of stale favicons.

chrome/browser/favicon/favicon_handler.cc

 // 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.
 
 #include "chrome/browser/favicon/favicon_handler.h"
 
 #include "build/build_config.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/history/select_favicon_frames.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
+#include "grit/ui_resources.h"
 #include "skia/ext/image_operations.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_util.h"
 
 using content::NavigationEntry;
 
 namespace {
 
 // Returns history::IconType the given icon_type corresponds to.
@@ skipping 328 matching lines @@
   if (!entry)
     return;
 
   // For FAVICON.
   if (current_candidate()->icon_type == FaviconURL::FAVICON) {
     if (!favicon_expired_or_incomplete_ && entry->GetFavicon().valid &&
         DoUrlAndIconMatch(*current_candidate(), entry->GetFavicon().url,
                           history::FAVICON))
       return;
 
+    // TODO(msw): valid depending on url, or leave as-is?
+    entry->GetFavicon().valid = false;
     entry->GetFavicon().url = current_candidate()->icon_url;
+    // TODO(msw): Will this cause flicker? Do this when the fetch errors out?
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    entry->GetFavicon().image = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);
   } else if (!favicon_expired_or_incomplete_ && got_favicon_from_history_ &&
              HasValidResult(history_results_) &&
              DoUrlsAndIconsMatch(*current_candidate(), history_results_)) {
     return;
   }
 
   if (got_favicon_from_history_)
     DownloadFaviconOrAskHistory(entry->GetURL(), current_candidate()->icon_url,
         ToHistoryIconType(current_candidate()->icon_type));
 }
@@ skipping 37 matching lines @@
     // during the downloading.
     bool request_next_icon = true;
     if (!errored) {
       request_next_icon = !UpdateFaviconCandidate(
           i->second.url, image_url, image, score, i->second.icon_type);
     }
     if (request_next_icon && GetEntry() && image_urls_.size() > 1) {
       // Remove the first member of image_urls_ and process the remaining.
       image_urls_.pop_front();
       ProcessCurrentUrl();
-    } else if (favicon_candidate_.icon_type != history::INVALID_ICON) {
+    } else {
+      // Show the default favicon if the response was invalid.
+      if (favicon_candidate_.icon_type != history::INVALID_ICON) {
+        ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+        favicon_candidate_.image = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);
+        // TODO(msw): the icon_type is not necessarily |FAVICON|... 
+        favicon_candidate_.icon_type = history::FAVICON;
+      }
+
       // No more icons to request, set the favicon from the candidate.
       SetFavicon(favicon_candidate_.url,
                  favicon_candidate_.image_url,
                  favicon_candidate_.image,
                  favicon_candidate_.icon_type);
       // Reset candidate.
       image_urls_.clear();
       favicon_candidate_ = FaviconCandidate();
     }
   }
@@ skipping 203 matching lines @@
   const int download_id = DownloadFavicon(image_url, image_size);
   if (download_id) {
     // Download ids should be unique.
     DCHECK(download_requests_.find(download_id) == download_requests_.end());
     download_requests_[download_id] =
         DownloadRequest(url, image_url, callback, icon_type);
   }
 
   return download_id;
 }