| Index: chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm
 | 
| diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm
 | 
| index c3ae23d376e266e8bac4438073d64dca33f09c3d..3c379ee26a2ffe03e5370f29e0e82ba1a06fae61 100644
 | 
| --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm
 | 
| +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm
 | 
| @@ -26,14 +26,14 @@ TEST_F(StatusIconMacTest, Create) {
 | 
|    icon->SetImage(*image);
 | 
|    gfx::ImageSkia* pressed = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON_PRESSED);
 | 
|    icon->SetPressedImage(*pressed);
 | 
| -  icon->SetToolTip(ASCIIToUTF16("tool tip"));
 | 
| +  icon->SetToolTip(base::ASCIIToUTF16("tool tip"));
 | 
|  }
 | 
|  
 | 
|  TEST_F(StatusIconMacTest, CreateMenu) {
 | 
|    // Create a menu and verify by getting the title of the first menu item.
 | 
|    const char* menu_title = "Menu Title";
 | 
|    scoped_ptr<StatusIconMenuModel> model(new StatusIconMenuModel(NULL));
 | 
| -  model->AddItem(0, ASCIIToUTF16(menu_title));
 | 
| +  model->AddItem(0, base::ASCIIToUTF16(menu_title));
 | 
|  
 | 
|    scoped_ptr<StatusIconMac> icon(new StatusIconMac());
 | 
|    icon->UpdatePlatformContextMenu(model.get());
 | 
| @@ -49,11 +49,11 @@ TEST_F(StatusIconMacTest, MenuToolTip) {
 | 
|    const char* menu_title = "Menu Title";
 | 
|    const char* tool_tip = "Tool tip";
 | 
|    scoped_ptr<StatusIconMenuModel> model(new StatusIconMenuModel(NULL));
 | 
| -  model->AddItem(0, ASCIIToUTF16(menu_title));
 | 
| +  model->AddItem(0, base::ASCIIToUTF16(menu_title));
 | 
|  
 | 
|    scoped_ptr<StatusIconMac> icon(new StatusIconMac());
 | 
|    icon->UpdatePlatformContextMenu(model.get());
 | 
| -  icon->SetToolTip(ASCIIToUTF16(tool_tip));
 | 
| +  icon->SetToolTip(base::ASCIIToUTF16(tool_tip));
 | 
|    EXPECT_EQ(2, [[icon->item() menu] numberOfItems]);
 | 
|  
 | 
|    NSMenuItem* toolTipItem = [[icon->item() menu] itemAtIndex:0];
 | 
| 
 |