Remove wstring from TableModel....

chrome/browser/language_order_table_model.cc

 // 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.
 
 #include "chrome/browser/language_order_table_model.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
@@ skipping 21 matching lines @@
     }
   }
   if (observer_)
     observer_->OnModelChanged();
 }
 
 void LanguageOrderTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
-std::wstring LanguageOrderTableModel::GetText(int row, int column_id) {
+string16 LanguageOrderTableModel::GetText(int row, int column_id) {
   DCHECK(row >= 0 && row < RowCount());
   const std::string app_locale = g_browser_process->GetApplicationLocale();
-  return UTF16ToWide(l10n_util::GetDisplayNameForLocale(languages_.at(row),
-                                                        app_locale,
-                                                        true));
+  return l10n_util::GetDisplayNameForLocale(languages_.at(row),
+                                            app_locale,
+                                            true);
 }
 
 bool LanguageOrderTableModel::Add(const std::string& language) {
   if (language.empty())
     return false;
   // Check for selecting duplicated language.
   for (std::vector<std::string>::const_iterator cit = languages_.begin();
        cit != languages_.end(); ++cit)
     if (*cit == language)
       return false;
@@ skipping 49 matching lines @@
     observer_->OnItemsChanged(0, RowCount());
 }
 
 std::string LanguageOrderTableModel::GetLanguageList() {
   return JoinString(languages_, ',');
 }
 
 int LanguageOrderTableModel::RowCount() {
   return static_cast<int>(languages_.size());
 }