Expire favicons which were added with default favicon sizes

chrome/browser/favicon/favicon_handler_unittest.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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 36 matching lines @@
 void SetFaviconBitmapResult(
     const GURL& icon_url,
     history::IconType icon_type,
     bool expired,
     std::vector<history::FaviconBitmapResult>* favicon_bitmap_results) {
   scoped_refptr<base::RefCountedBytes> data(new base::RefCountedBytes());
   FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
   history::FaviconBitmapResult bitmap_result;
   bitmap_result.expired = expired;
   bitmap_result.bitmap_data = data;
-  bitmap_result.pixel_size = gfx::Size();
+  // Use a pixel size other than (0,0) as (0,0) has a special meaning.
+  bitmap_result.pixel_size = gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
   bitmap_result.icon_type = icon_type;
   bitmap_result.icon_url = icon_url;
 
   favicon_bitmap_results->push_back(bitmap_result);
 }
 
 void SetFaviconBitmapResult(
     const GURL& icon_url,
     std::vector<history::FaviconBitmapResult>* favicon_bitmap_results) {
   SetFaviconBitmapResult(icon_url, history::FAVICON, false /* expired */,
@@ skipping 264 matching lines @@
 
   scoped_ptr<DownloadHandler> download_handler_;
   scoped_ptr<HistoryRequestHandler> history_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFaviconHandler);
 };
 
 namespace {
 
 void HistoryRequestHandler::InvokeCallback() {
-  if (!callback_.is_null())
-    callback_.Run(0, history_results_, history::IconURLSizesMap());
+  if (!callback_.is_null()) {
+    history::IconURLSizesMap icon_url_sizes;
+    // Build IconURLSizesMap such that the requirement that all the icon URLs
+    // in |history_results_| be present in |icon_url_sizes| holds.
+    // Add the pixel size for each of |history_results_| to |icon_url_sizes|
+    // as empty favicon sizes has a special meaning.
+    for (size_t i = 0; i < history_results_.size(); ++i) {
+      const history::FaviconBitmapResult& bitmap_result = history_results_[i];
+      const GURL& icon_url = bitmap_result.icon_url;
+      icon_url_sizes[icon_url].push_back(bitmap_result.pixel_size);
+    }
+
+    callback_.Run(0, history_results_, icon_url_sizes);
+  }
 }
 
 void DownloadHandler::InvokeCallback() {
   SkBitmap bitmap;
   const int kRequestedSize = gfx::kFaviconSize;
   int downloaded_size = (download_->image_size > 0) ?
       download_->image_size : gfx::kFaviconSize;
   FillDataToBitmap(downloaded_size, downloaded_size, &bitmap);
   std::vector<SkBitmap> bitmaps;
   bitmaps.push_back(bitmap);
@@ skipping 652 matching lines @@
   download_handler->SetImageSize(kLargeSize);
   download_handler->InvokeCallback();
 
   // Check that the callback was invoked with the unresized bitmap.
   const gfx::Size& downloaded_bitmap_size = downloader.downloaded_bitmap_size();
   EXPECT_EQ(kLargeSize, downloaded_bitmap_size.width());
   EXPECT_EQ(kLargeSize, downloaded_bitmap_size.height());
 }
 
 }  // namespace.