Cleanup history favicon code

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/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
@@ skipping 296 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()) {
-    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(history_results_, icon_url_sizes);
+    callback_.Run(history_results_);
   }
 }
 
 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;
@@ skipping 619 matching lines @@
 
   // Verify correct icon size chosen.
   EXPECT_EQ(icon_url_preferred1, handler.GetEntry()->GetFavicon().url);
   EXPECT_TRUE(handler.GetEntry()->GetFavicon().valid);
   EXPECT_FALSE(handler.GetEntry()->GetFavicon().image.IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize,
             handler.GetEntry()->GetFavicon().image.ToSkBitmap()->width());
 }
 
 }  // namespace.