Remove wstring from TableModel....

chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm

Index: chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm	(revision 70272)
+++ chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm	(working copy)
@@ -295,9 +295,9 @@
     DCHECK(!tableColumn);
     TableModel::Groups groups = controller_->table_model()->GetGroups();
     if (row == 0) {
-      return base::SysWideToNSString(groups[0].title);
+      return base::SysUTF16ToNSString(groups[0].title);
     } else {
-      return base::SysWideToNSString(groups[1].title);
+      return base::SysUTF16ToNSString(groups[1].title);
     }
   }
 
@@ -312,8 +312,8 @@
     // The keyword object value is a normal string.
     int index = [self indexInModelForRow:row];
     int columnID = IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN;
-    std::wstring text = controller_->table_model()->GetText(index, columnID);
-    return base::SysWideToNSString(text);
+    string16 text = controller_->table_model()->GetText(index, columnID);
+    return base::SysUTF16ToNSString(text);
   }
 
   // And we shouldn't have any other columns...
@@ -357,9 +357,9 @@
   if ([[tableColumn identifier] isEqualToString:@"name"]) {
     DCHECK([cell isKindOfClass:[NSButtonCell class]]);
     NSButtonCell* buttonCell = static_cast<NSButtonCell*>(cell);
-    std::wstring title = controller_->table_model()->GetText(offsetRow,
+    string16 title = controller_->table_model()->GetText(offsetRow,
         IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN);
-    [buttonCell setTitle:base::SysWideToNSString(title)];
+    [buttonCell setTitle:base::SysUTF16ToNSString(title)];
     [buttonCell setImage:observer_->GetImageForRow(offsetRow)];
     [buttonCell setRefusesFirstResponder:YES];  // Don't push in like a button.
     [buttonCell setHighlightsBy:NSNoCellMask];