Remove wstring from TableModel....

chrome/browser/gtk/options/languages_page_gtk.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/gtk/options/languages_page_gtk.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 257 matching lines @@
                             profile()->GetPrefs(), this);
   enable_spellcheck_.Init(prefs::kEnableSpellCheck,
                           profile()->GetPrefs(), this);
   enable_autospellcorrect_.Init(prefs::kEnableAutoSpellCorrect,
                                 profile()->GetPrefs(), this);
   NotifyPrefChanged(NULL);
   EnableControls();
 }
 
 void LanguagesPageGtk::SetColumnValues(int row, GtkTreeIter* iter) {
-  std::wstring lang = language_order_table_model_->GetText(row, 0);
+  string16 lang = language_order_table_model_->GetText(row, 0);
   gtk_list_store_set(language_order_store_, iter,
-                     COL_LANG, WideToUTF8(lang).c_str(),
+                     COL_LANG, UTF16ToUTF8(lang).c_str(),
                      -1);
 }
 
 void LanguagesPageGtk::OnAnyModelUpdate() {
   if (!initializing_)
     accept_languages_.SetValue(language_order_table_model_->GetLanguageList());
   EnableControls();
 }
 
 void LanguagesPageGtk::EnableControls() {
@@ skipping 151 matching lines @@
     OnAddLanguage(language);
     spellcheck_language_added_ = language;
   } else {
     spellcheck_language_added_ = "";
   }
 
   UserMetricsRecordAction(UserMetricsAction("Options_DictionaryLanguage"),
                           profile()->GetPrefs());
   dictionary_language_.SetValue(language);
 }