Remove wstring from TableModel....

chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm

 // Copyright (c) 2009 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 <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h"
 
 #import "base/mac_util.h"
 #include "base/lazy_instance.h"
@@ skipping 277 matching lines @@
   return rowCount + numGroups;
 }
 
 - (id)tableView:(NSTableView*)tv
     objectValueForTableColumn:(NSTableColumn*)tableColumn
                           row:(NSInteger)row {
   if ([self tableView:tv isGroupRow:row]) {
     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);
     }
   }
 
   NSString* identifier = [tableColumn identifier];
   if ([identifier isEqualToString:@"name"]) {
     // The name column is an NSButtonCell so we can have text and image in the
     // same cell. As such, the "object value" for a button cell is either on
     // or off, so we always return off so we don't act like a button.
     return [NSNumber numberWithInt:NSOffState];
   }
   if ([identifier isEqualToString:@"keyword"]) {
     // 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...
   NOTREACHED();
   return nil;
 }
 
 // Table View Delegate --------------------------------------------------------
 
 // When the selection in the table view changes, we need to adjust buttons.
@@ skipping 23 matching lines @@
     return groupCell_.get();
   }
 
   NSCell* cell = [tableColumn dataCellForRow:row];
   int offsetRow = [self indexInModelForRow:row];
 
   // Set the favicon and title for the search engine in the name column.
   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];
   }
 
   // The default search engine should be in bold font.
   const TemplateURL* defaultEngine =
       controller_->url_model()->GetDefaultSearchProvider();
   int rowIndex = controller_->table_model()->IndexOfTemplateURL(defaultEngine);
   if (rowIndex == offsetRow) {
@@ skipping 43 matching lines @@
       controller_->table_model()->last_search_engine_index() + 1;
   DCHECK_NE(row, otherGroupId);
   if (row >= otherGroupId) {
     return row - 2;  // Other group.
   } else {
     return row - 1;  // Default group.
   }
 }
 
 @end