Remove wstring from TableModel....

chrome/browser/ui/cocoa/table_model_array_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/ui/cocoa/table_model_array_controller.h"
 
 #include "app/table_model.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/remove_rows_table_model.h"
@@ skipping 65 matching lines @@
 - (void)modelDidChange {
   NSIndexSet* indexes = [NSIndexSet indexSetWithIndexesInRange:
       NSMakeRange(0, [[self arrangedObjects] count])];
   [self removeObjectsAtArrangedObjectIndexes:indexes];
   if (model_->HasGroups()) {
     const TableModel::Groups& groups = model_->GetGroups();
     DCHECK(groupTitle_.get());
     for (TableModel::Groups::const_iterator it = groups.begin();
          it != groups.end(); ++it) {
       NSDictionary* group = [NSDictionary dictionaryWithObjectsAndKeys:
-          base::SysWideToNSString(it->title), groupTitle_.get(),
+          base::SysUTF16ToNSString(it->title), groupTitle_.get(),
           [NSNumber numberWithBool:YES], kIsGroupRow,
           nil];
       [self addObject:group];
     }
   }
   [self modelDidAddItemsInRange:NSMakeRange(0, model_->RowCount())];
 }
 
 - (NSUInteger)offsetForGroupID:(int)groupID startingOffset:(NSUInteger)offset {
   const TableModel::Groups& groups = model_->GetGroups();
@@ skipping 87 matching lines @@
 }
 
 - (NSDictionary*)columnValuesForRow:(NSInteger)row {
   NSMutableDictionary* dict = [NSMutableDictionary dictionary];
   if (model_->HasGroups()) {
     [dict setObject:[NSNumber numberWithInt:model_->GetGroupID(row)]
              forKey:kGroupID];
   }
   for (NSString* identifier in columns_.get()) {
     int column_id = [[columns_ objectForKey:identifier] intValue];
-    std::wstring text = model_->GetText(row, column_id);
-    [dict setObject:base::SysWideToNSString(text) forKey:identifier];
+    string16 text = model_->GetText(row, column_id);
+    [dict setObject:base::SysUTF16ToNSString(text) forKey:identifier];
   }
   return dict;
 }
 
 // Overridden from NSArrayController -----------------------------------------
 
 - (BOOL)canRemove {
   if (!model_)
     return NO;
   RemoveRowsTableModel::Rows rows;
@@ skipping 31 matching lines @@
   return indexes;
 }
 
 // Actions --------------------------------------------------------------------
 
 - (IBAction)removeAll:(id)sender {
   model_->RemoveAll();
 }
 
 @end