Index: chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm |
=================================================================== |
--- chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm (revision 55911) |
+++ chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm (working copy) |
@@ -24,7 +24,7 @@ |
// These are here because there is no autorelease pool for the |
// constructor. |
color_ = [NSColor blackColor]; |
- font_ = gfx::Font::CreateFont( |
+ font_ = gfx::Font( |
base::SysNSStringToWide([[NSFont userFontOfSize:12] fontName]), 12); |
} |
@@ -427,7 +427,7 @@ |
const float kNarrow = 20.0; |
NSDictionary* attributes = |
- [NSDictionary dictionaryWithObject:font_.nativeFont() |
+ [NSDictionary dictionaryWithObject:font_.GetNativeFont() |
forKey:NSFontAttributeName]; |
scoped_nsobject<NSMutableAttributedString> as( |
[[NSMutableAttributedString alloc] initWithString:contents |
@@ -476,7 +476,7 @@ |
// Figure out the width of the contents. |
NSDictionary* attributes = |
- [NSDictionary dictionaryWithObject:font_.nativeFont() |
+ [NSDictionary dictionaryWithObject:font_.GetNativeFont() |
forKey:NSFontAttributeName]; |
const float contentsWidth = [contents sizeWithAttributes:attributes].width; |