Remove wstring from l10n_util. Part 1....

chrome/browser/chromeos/input_method/input_method_util.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/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 331 matching lines @@
 struct CompareLanguageCodesByLanguageName
     : std::binary_function<const std::string&, const std::string&, bool> {
   explicit CompareLanguageCodesByLanguageName(icu::Collator* collator)
       : collator_(collator) {
   }
 
   // Calling GetLanguageDisplayNameFromCode() in the comparator is not
   // efficient, but acceptable as the function is cheap, and the language
   // list is short (about 40 at most).
   bool operator()(const std::string& s1, const std::string& s2) const {
-    const std::wstring key1 =
+    const string16 key1 =
         chromeos::input_method::GetLanguageDisplayNameFromCode(s1);
-    const std::wstring key2 =
+    const string16 key2 =
         chromeos::input_method::GetLanguageDisplayNameFromCode(s2);

[Evan Martin, 2010/12/24 01:00:42]

one line?

-    return l10n_util::StringComparator<std::wstring>(collator_)(key1, key2);
+    return l10n_util::StringComparator<string16>(collator_)(key1, key2);
   }
 
  private:
   icu::Collator* collator_;
 };
 
 // The comparator is used for sorting input method ids by their
 // corresponding language names, using the ICU collator.
 struct CompareInputMethodIdsByLanguageName
     : std::binary_function<const std::string&, const std::string&, bool> {
@@ skipping 204 matching lines @@
 
 std::string GetInputMethodDisplayNameFromId(
     const std::string& input_method_id) {
   static const char kDefaultDisplayName[] = "USA";
   std::map<std::string, std::string>::const_iterator iter
       = IdMaps::GetInstance()->id_to_display_name->find(input_method_id);
   return (iter == IdMaps::GetInstance()->id_to_display_name->end()) ?
       kDefaultDisplayName : iter->second;
 }
 
-std::wstring GetLanguageDisplayNameFromCode(const std::string& language_code) {
+string16 GetLanguageDisplayNameFromCode(const std::string& language_code) {
   if (!g_browser_process) {
-    return L"";
+    return string16();
   }
-  return UTF16ToWide(l10n_util::GetDisplayNameForLocale(
-      language_code, g_browser_process->GetApplicationLocale(), true));
+  return l10n_util::GetDisplayNameForLocale(
+      language_code, g_browser_process->GetApplicationLocale(), true);
 }
 
-std::wstring GetLanguageNativeDisplayNameFromCode(
+string16 GetLanguageNativeDisplayNameFromCode(
     const std::string& language_code) {
-  return UTF16ToWide(l10n_util::GetDisplayNameForLocale(
-      language_code, language_code, true));
+  return l10n_util::GetDisplayNameForLocale(language_code, language_code, true);
 }
 
 void SortLanguageCodesByNames(std::vector<std::string>* language_codes) {
   if (!g_browser_process) {
     return;
   }
   // We should build collator outside of the comparator. We cannot have
   // scoped_ptr<> in the comparator for a subtle STL reason.
   UErrorCode error = U_ZERO_ERROR;
   icu::Locale locale(g_browser_process->GetApplicationLocale().c_str());
@@ skipping 90 matching lines @@
     library->ChangeInputMethod(initial_input_method_id);
   }
 }
 
 void OnLocaleChanged() {
   IdMaps::GetInstance()->ReloadMaps();
 }
 
 }  // namespace input_method
 }  // namespace chromeos