| Index: chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
|
| diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
|
| index e5779eeaeca90638f6902b2afa4156fd301dff49..2e8c9d2661572bc2b5ae5c03a9fc04571b6bb420 100644
|
| --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
|
| +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
|
| @@ -175,8 +175,9 @@ TEST_F(HistoryMenuBridgeTest, ClearHistoryMenuEmpty) {
|
| TEST_F(HistoryMenuBridgeTest, AddItemToMenu) {
|
| NSMenu* menu = [[[NSMenu alloc] initWithTitle:@"history foo"] autorelease];
|
|
|
| - const base::string16 short_url = ASCIIToUTF16("http://foo/");
|
| - const base::string16 long_url = ASCIIToUTF16("http://super-duper-long-url--."
|
| + const base::string16 short_url = base::ASCIIToUTF16("http://foo/");
|
| + const base::string16 long_url = base::ASCIIToUTF16(
|
| + "http://super-duper-long-url--."
|
| "that.cannot.possibly.fit.even-in-80-columns"
|
| "or.be.reasonably-displayed-in-a-menu"
|
| "without.looking-ridiculous.com/"); // 140 chars total
|
| @@ -329,7 +330,7 @@ TEST_F(HistoryMenuBridgeTest, RecentlyClosedTabsAndWindows) {
|
| TEST_F(HistoryMenuBridgeTest, GetFaviconForHistoryItem) {
|
| // Create a fake item.
|
| HistoryMenuBridge::HistoryItem item;
|
| - item.title = ASCIIToUTF16("Title");
|
| + item.title = base::ASCIIToUTF16("Title");
|
| item.url = GURL("http://google.com");
|
|
|
| // Request the icon.
|
|
|