Expire favicons which were added with default favicon sizes

chrome/browser/extensions/extension_web_ui.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/extensions/extension_web_ui.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 105 matching lines @@
   }
 
  private:
   ~ExtensionWebUIImageLoadingTracker() {}
 
   // Forwards the result of the request. If no favicon was available then
   // |icon| will be empty. Once the result has been forwarded the instance is
   // deleted.
   void ForwardResult(const gfx::Image& icon) {
     std::vector<history::FaviconBitmapResult> favicon_bitmap_results;
+    history::IconURLSizesMap icon_url_sizes;
     SkBitmap icon_bitmap = icon.AsBitmap();
     if (!icon_bitmap.empty()) {
       scoped_refptr<base::RefCountedBytes> icon_data(
           new base::RefCountedBytes());
       if (gfx::PNGCodec::EncodeBGRASkBitmap(icon_bitmap, false,
                                             &icon_data->data())) {
         history::FaviconBitmapResult bitmap_result;
         bitmap_result.bitmap_data = icon_data;
         bitmap_result.pixel_size = gfx::Size(icon_bitmap.width(),
                                              icon_bitmap.height());
+        // Leave |bitmap_result|'s icon URL as the default of GURL().
         bitmap_result.icon_type = history::FAVICON;
 
         favicon_bitmap_results.push_back(bitmap_result);
+
+        // Build IconURLSizesMap such that the requirement that all the icon
+        // URLs in |favicon_bitmap_results| be present in |icon_url_sizes|
+        // holds. Set the favicon sizes to the pixel size of |icon_bitmap|.
+        icon_url_sizes[GURL()].push_back(bitmap_result.pixel_size);
       } else {
         NOTREACHED() << "Could not encode extension favicon";
       }
     }
 
     request_->ForwardResultAsync(request_->handle(), favicon_bitmap_results,
-                                 history::IconURLSizesMap());
+                                 icon_url_sizes);
     delete this;
   }
 
   ImageLoadingTracker tracker_;
   scoped_refptr<FaviconService::GetFaviconRequest> request_;
   const Extension* extension_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebUIImageLoadingTracker);
 };
 
@@ skipping 273 matching lines @@
 }
 
 // static
 void ExtensionWebUI::GetFaviconForURL(Profile* profile,
     FaviconService::GetFaviconRequest* request, const GURL& page_url) {
   // tracker deletes itself when done.
   ExtensionWebUIImageLoadingTracker* tracker =
       new ExtensionWebUIImageLoadingTracker(profile, request, page_url);
   tracker->Init();
 }