Adds support for saving favicon size into history database.

chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/favicon_size.h"
 
 namespace {
 
 class MockTRS : public TabRestoreService {
  public:
   MockTRS(Profile* profile) : TabRestoreService(profile, NULL) {}
   MOCK_CONST_METHOD0(entries, const TabRestoreService::Entries&());
 };
 
 class MockBridge : public HistoryMenuBridge {
@@ skipping 332 matching lines @@
   gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &raw);
 
   // Set up the HistoryItem.
   HistoryMenuBridge::HistoryItem item;
   item.menu_item.reset([[NSMenuItem alloc] init]);
   GetFaviconForHistoryItem(&item);
 
   // Pretend to be called back.
   history::FaviconData favicon;
   favicon.known_icon = true;
-  favicon.image_data = new base::RefCountedBytes(raw);
+  favicon.bitmap_data = new base::RefCountedBytes(raw);
+  favicon.requested_size = gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
   favicon.expired = false;
   favicon.icon_url = GURL();
   favicon.icon_type = history::FAVICON;
   GotFaviconData(item.icon_handle, favicon);
 
   // Make sure the callback works.
   EXPECT_FALSE(item.icon_requested);
   EXPECT_TRUE(item.icon.get());
   EXPECT_TRUE([item.menu_item image]);
 }
 
 }  // namespace