Remove wstrings from bookmarks, part 8.

chrome/browser/cocoa/bookmark_bubble_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_bubble_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"  // TODO(viettrungluu): remove
@@ skipping 260 matching lines @@
     // |-remove:| calls |-close| so don't do it.
     [self remove:sender];
   } else {
     [self ok:sender];
   }
 }
 
 - (IBAction)remove:(id)sender {
   [self stopPulsingBookmarkButton];
   // TODO(viettrungluu): get rid of conversion and utf_string_conversions.h.
-  model_->SetURLStarred(node_->GetURL(), WideToUTF16Hack(node_->GetTitle()),
-                        false);
+  model_->SetURLStarred(node_->GetURL(), node_->GetTitleAsString16(), false);
   UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_Unstar"),
                             model_->profile());
   node_ = NULL;  // no longer valid
   [self ok:sender];
 }
 
 // The controller is  the target of the pop up button box action so it can
 // handle when "choose another folder" was picked.
 - (IBAction)folderChanged:(id)sender {
   DCHECK([sender isEqual:folderPopUpButton_]);
@@ skipping 24 matching lines @@
     [self ok:self];
   }
 }
 
 // Look at the dialog; if the user has changed anything, update the
 // bookmark node to reflect this.
 - (void)updateBookmarkNode {
   if (!node_) return;
 
   // First the title...
-  NSString* oldTitle = base::SysWideToNSString(node_->GetTitle());
+  NSString* oldTitle = base::SysUTF16ToNSString(node_->GetTitleAsString16());
   NSString* newTitle = [nameTextField_ stringValue];
   if (![oldTitle isEqual:newTitle]) {
     model_->SetTitle(node_, base::SysNSStringToUTF16(newTitle));
     UserMetrics::RecordAction(
         UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"),
         model_->profile());
   }
   // Then the parent folder.
   const BookmarkNode* oldParent = node_->GetParent();
   NSMenuItem* selectedItem = [folderPopUpButton_ selectedItem];
   id representedObject = [selectedItem representedObject];
   if ([representedObject isEqual:[[self class] chooseAnotherFolderObject]]) {
     // "Choose another folder..."
     return;
   }
   const BookmarkNode* newParent =
       static_cast<const BookmarkNode*>([representedObject pointerValue]);
   DCHECK(newParent);
   if (oldParent != newParent) {
     int index = newParent->GetChildCount();
     model_->Move(node_, newParent, index);
     UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_ChangeParent"),
                               model_->profile());
   }
 }
 
 // Fill in all information related to the folder pop up button.
 - (void)fillInFolderList {
-  [nameTextField_ setStringValue:base::SysWideToNSString(node_->GetTitle())];
+  [nameTextField_
+      setStringValue:base::SysUTF16ToNSString(node_->GetTitleAsString16())];
   DCHECK([folderPopUpButton_ numberOfItems] == 0);
   [self addFolderNodes:model_->root_node()
          toPopUpButton:folderPopUpButton_
            indentation:0];
   NSMenu* menu = [folderPopUpButton_ menu];
   NSString* title = [[self class] chooseAnotherFolderString];
   NSMenuItem *item = [menu addItemWithTitle:title
                                      action:NULL
                               keyEquivalent:@""];
   ChooseAnotherFolder* obj = [[self class] chooseAnotherFolderObject];
@@ skipping 13 matching lines @@
   return l10n_util::GetNSStringWithFixup(
       IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
 }
 
 // For the given folder node, walk the tree and add folder names to
 // the given pop up button.
 - (void)addFolderNodes:(const BookmarkNode*)parent
          toPopUpButton:(NSPopUpButton*)button
            indentation:(int)indentation {
   if (!model_->is_root(parent))  {
-    NSString* title = base::SysWideToNSString(parent->GetTitle());
+    NSString* title = base::SysUTF16ToNSString(parent->GetTitleAsString16());
     NSMenu* menu = [button menu];
     NSMenuItem* item = [menu addItemWithTitle:title
                                        action:NULL
                                 keyEquivalent:@""];
     [item setRepresentedObject:[NSValue valueWithPointer:parent]];
     [item setIndentationLevel:indentation];
     ++indentation;
   }
   for (int i = 0; i < parent->GetChildCount(); i++) {
     const BookmarkNode* child = parent->GetChild(i);
@@ skipping 19 matching lines @@
   NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
   DCHECK(idx != -1);
   [folderPopUpButton_ selectItemAtIndex:idx];
 }
 
 - (NSPopUpButton*)folderPopUpButton {
   return folderPopUpButton_;
 }
 
 @end  // implementation BookmarkBubbleController(ExposedForUnitTesting)