Index: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm |
=================================================================== |
--- chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm (revision 72388) |
+++ chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm (working copy) |
@@ -102,7 +102,7 @@ |
SelectedKeywordDecoration selected_keyword_decoration([view_ font]); |
selected_keyword_decoration.SetVisible(true); |
- selected_keyword_decoration.SetKeyword(std::wstring(L"Google"), false); |
+ selected_keyword_decoration.SetKeyword(ASCIIToUTF16("Google"), false); |
[cell addLeftDecoration:&selected_keyword_decoration]; |
EXPECT_NE(selected_keyword_decoration.GetWidthForSpace(kVeryWide), |
LocationBarDecoration::kOmittedWidth); |
Property changes on: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm |
___________________________________________________________________ |
Deleted: svn:mergeinfo |