Remove wstrings from bookmarks, part 8.

chrome/browser/cocoa/bookmark_bar_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/cocoa/bookmark_bar_controller.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 966 matching lines @@
     } else {
       [self tagEmptyMenu:submenu];
     }
   } else {
     [item setTarget:self];
     [item setAction:@selector(openBookmarkMenuItem:)];
     [item setTag:[self menuTagFromNodeId:child->id()]];
     // Add a tooltip
     std::string url_string = child->GetURL().possibly_invalid_spec();
     NSString* tooltip = [NSString stringWithFormat:@"%@\n%s",
-                         base::SysWideToNSString(child->GetTitle()),
+                         base::SysUTF16ToNSString(child->GetTitleAsString16()),
                          url_string.c_str()];
     [item setToolTip:tooltip];
   }
 }
 
 // Empty menus are odd; if empty, add something to look at.
 // Matches windows behavior.
 - (void)tagEmptyMenu:(NSMenu*)menu {
   NSString* empty_menu_title = l10n_util::GetNSString(IDS_MENU_EMPTY_SUBMENU);
   [menu addItem:[[[NSMenuItem alloc] initWithTitle:empty_menu_title
                                             action:NULL
                                      keyEquivalent:@""] autorelease]];
 }
 
 // Add the children of the given bookmark node (and their children...)
 // to menu, one menu item per node.
 - (void)addFolderNode:(const BookmarkNode*)node toMenu:(NSMenu*)menu {
   for (int i = 0; i < node->GetChildCount(); i++) {
     const BookmarkNode* child = node->GetChild(i);
     [self addNode:child toMenu:menu];
   }
 }
 
 // Return an autoreleased NSMenu that represents the given bookmark
 // folder node.
 - (NSMenu *)menuForFolderNode:(const BookmarkNode*)node {
   if (!node->is_folder())
     return nil;
-  NSString* title = base::SysWideToNSString(node->GetTitle());
+  NSString* title = base::SysUTF16ToNSString(node->GetTitleAsString16());
   NSMenu* menu = [[[NSMenu alloc] initWithTitle:title] autorelease];
   [self addFolderNode:node toMenu:menu];
 
   if (![menu numberOfItems]) {
     [self tagEmptyMenu:menu];
   }
   return menu;
 }
 
 // Return an appropriate width for the given bookmark button cell.
@@ skipping 71 matching lines @@
   }
 
   if (node->is_folder()) {
     [button setTarget:self];
     [button setAction:@selector(openBookmarkFolderFromButton:)];
   } else {
     // Make the button do something
     [button setTarget:self];
     [button setAction:@selector(openBookmark:)];
     // Add a tooltip.
-    NSString* title = base::SysWideToNSString(node->GetTitle());
+    NSString* title = base::SysUTF16ToNSString(node->GetTitleAsString16());
     std::string url_string = node->GetURL().possibly_invalid_spec();
     NSString* tooltip = [NSString stringWithFormat:@"%@\n%s", title,
                          url_string.c_str()];
     [button setToolTip:tooltip];
   }
   return [[button.get() retain] autorelease];
 }
 
 // Add non-bookmark buttons to the view.  This includes the chevron
 // and the "other bookmarks" button.  Technically "other bookmarks" is
@@ skipping 1313 matching lines @@
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end