Remove wstring from l10n_util. Part 1....

chrome/browser/chromeos/options/language_config_view.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/chromeos/options/language_config_view.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 221 matching lines @@
   right_container_->AddChildView(CreatePerLanguageConfigView(language_code));
   MaybeDisableLastCheckbox();
   // Layout the right container. This is needed for the contents on the
   // right to be displayed properly.
   right_container_->Layout();
 }
 
 std::wstring LanguageConfigView::GetText(int row, int column_id) {
   if (row >= 0 && row < static_cast<int>(
           model_.num_preferred_language_codes())) {
-    return input_method::GetLanguageDisplayNameFromCode(
-        model_.preferred_language_code_at(row));
+    return UTF16ToWide(input_method::GetLanguageDisplayNameFromCode(
+        model_.preferred_language_code_at(row)));
   }
   NOTREACHED();
   return L"";
 }
 
 void LanguageConfigView::SetObserver(TableModelObserver* observer) {
   // We don't need the observer for the table mode, since we implement the
   // table model as part of the LanguageConfigView class.
   // http://crbug.com/38266
 }
@@ skipping 367 matching lines @@
 
 void LanguageConfigView::EnableAllCheckboxes() {
   for (std::set<InputMethodCheckbox*>::iterator checkbox =
            input_method_checkboxes_.begin();
        checkbox != input_method_checkboxes_.end(); ++checkbox) {
     (*checkbox)->SetEnabled(true);
   }
 }
 
 }  // namespace chromeos