Revert 71167 - Remove wstring from gfx....

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 
 #include "app/text_elider.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_BOOKMARK_MENU
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace {
 
 // Menus more than this many pixels wide will get trimmed
 // TODO(jrg): ask UI dudes what a good value is.
 const NSUInteger kMaximumMenuPixelsWide = 300;
 
 }
 
 @implementation BookmarkMenuCocoaController
 
 + (NSString*)menuTitleForNode:(const BookmarkNode*)node {
   NSFont* nsfont = [NSFont menuBarFontOfSize:0];  // 0 means "default"
-  gfx::Font font(base::SysNSStringToUTF16([nsfont fontName]),
+  gfx::Font font(base::SysNSStringToWide([nsfont fontName]),
                  static_cast<int>([nsfont pointSize]));
   string16 title = gfx::ElideText(node->GetTitle(),
                                   font,
                                   kMaximumMenuPixelsWide,
                                   false);
   return base::SysUTF16ToNSString(title);
 }
 
 - (id)initWithBridge:(BookmarkMenuBridge *)bridge {
   if ((self = [super init])) {
@@ skipping 46 matching lines @@
   const BookmarkNode* node = [self nodeForIdentifier:identifier];
   DCHECK(node);
   if (!node)
     return;  // shouldn't be reached
 
   [self openURLForNode:node];
 }
 
 @end  // BookmarkMenuCocoaController