Remove wstrings from bookmarks, part 8.

chrome/browser/cocoa/bookmark_menu_bridge.mm

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 <AppKit/AppKit.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/app_controller_mac.h"
@@ skipping 203 matching lines @@
   if (set_title) {
     NSString* title = [BookmarkMenuCocoaController menuTitleForNode:node];
     [item setTitle:title];
   }
   [item setTarget:controller_];
   [item setAction:@selector(openBookmarkMenuItem:)];
   [item setTag:node->id()];
   // Add a tooltip
   std::string url_string = node->GetURL().possibly_invalid_spec();
   NSString* tooltip = [NSString stringWithFormat:@"%@\n%s",
-                                base::SysWideToNSString(node->GetTitle()),
-                                url_string.c_str()];
+                          base::SysUTF16ToNSString(node->GetTitleAsString16()),
+                          url_string.c_str()];
   [item setToolTip:tooltip];
 
   // Check to see if we have a favicon.
   NSImage* favicon = nil;
   BookmarkModel* model = GetBookmarkModel();
   if (model) {
     const SkBitmap& bitmap = model->GetFavIcon(node);
     if (!bitmap.isNull())
       favicon = gfx::SkBitmapToNSImage(bitmap);
   }
   // Either we do not have a loaded favicon or the conversion from SkBitmap
   // failed. Use the default site image instead.
   if (!favicon)
     favicon = nsimage_cache::ImageNamed(@"nav.pdf");
   [item setImage:favicon];
 }
 
 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) {
   if (!node)
     return nil;
   std::map<const BookmarkNode*, NSMenuItem*>::iterator it =
       bookmark_nodes_.find(node);
   if (it == bookmark_nodes_.end())
     return nil;
   return it->second;
 }