wip

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"
@@ skipping 357 matching lines @@
 
   // 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.bitmap_data = new base::RefCountedBytes(raw);
-  favicon.pixel_size = gfx::kFaviconSize;
-  favicon.scale_factor = ui::SCALE_FACTOR_100P;
+  favicon.pixel_size = gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
+  //favicon.scale_factor = ui::SCALE_FACTOR_100P;
   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