| Index: chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm
|
| ===================================================================
|
| --- chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm (revision 72331)
|
| +++ chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm (working copy)
|
| @@ -17,12 +17,12 @@
|
|
|
| TEST(AutocompleteEditViewMacTest, GetClipboardText) {
|
| ui::Clipboard clipboard;
|
| - std::wstring text;
|
| + string16 text;
|
|
|
| // Does an empty clipboard get empty text?
|
| clipboard.WriteObjects(ui::Clipboard::ObjectMap());
|
| text = AutocompleteEditViewMac::GetClipboardText(&clipboard);
|
| - EXPECT_EQ(std::wstring(), text);
|
| + EXPECT_EQ(string16(), text);
|
|
|
| const string16 plainText(ASCIIToUTF16("test text"));
|
| const std::string url("http://www.example.com/");
|
| @@ -35,7 +35,7 @@
|
| }
|
|
|
| text = AutocompleteEditViewMac::GetClipboardText(&clipboard);
|
| - EXPECT_EQ(UTF16ToWide(plainText), text);
|
| + EXPECT_EQ(plainText, text);
|
|
|
| // Can we pull a bookmark off the clipboard?
|
| {
|
| @@ -44,7 +44,7 @@
|
| }
|
|
|
| text = AutocompleteEditViewMac::GetClipboardText(&clipboard);
|
| - EXPECT_EQ(ASCIIToWide(url), text);
|
| + EXPECT_EQ(ASCIIToUTF16(url), text);
|
|
|
| // Do we pull text in preference to a bookmark?
|
| {
|
| @@ -54,7 +54,7 @@
|
| }
|
|
|
| text = AutocompleteEditViewMac::GetClipboardText(&clipboard);
|
| - EXPECT_EQ(UTF16ToWide(plainText), text);
|
| + EXPECT_EQ(plainText, text);
|
|
|
| // Do we get nothing if there is neither text nor a bookmark?
|
| {
|
|
|