Remove wstring from l10n_util. Part 1....

chrome/browser/chromeos/dom_ui/language_options_handler.cc

Index: chrome/browser/chromeos/dom_ui/language_options_handler.cc
===================================================================
--- chrome/browser/chromeos/dom_ui/language_options_handler.cc	(revision 70069)
+++ chrome/browser/chromeos/dom_ui/language_options_handler.cc	(working copy)
@@ -196,18 +196,18 @@
   // In theory, we should be able to create a map that is sorted by
   // display names using ICU comparator, but doing it is hard, thus we'll
   // use an auxiliary vector to achieve the same result.
-  typedef std::pair<std::string, std::wstring> LanguagePair;
-  typedef std::map<std::wstring, LanguagePair> LanguageMap;
+  typedef std::pair<std::string, string16> LanguagePair;
+  typedef std::map<string16, LanguagePair> LanguageMap;
   LanguageMap language_map;
   // The auxiliary vector mentioned above.
-  std::vector<std::wstring> display_names;
+  std::vector<string16> display_names;
 
   // Build the list of display names, and build the language map.
   for (std::set<std::string>::const_iterator iter = language_codes.begin();
        iter != language_codes.end(); ++iter) {
-    const std::wstring display_name =
+    const string16 display_name =
         input_method::GetLanguageDisplayNameFromCode(*iter);
-    const std::wstring native_display_name =
+    const string16 native_display_name =
         input_method::GetLanguageNativeDisplayNameFromCode(*iter);
     display_names.push_back(display_name);
     language_map[display_name] =
@@ -216,8 +216,8 @@
   DCHECK_EQ(display_names.size(), language_map.size());
 
   // Sort display names using locale specific sorter.
-  l10n_util::SortStrings(g_browser_process->GetApplicationLocale(),
-                         &display_names);
+  l10n_util::SortStrings16(g_browser_process->GetApplicationLocale(),
+                           &display_names);
 
   // Build the language list from the language map.
   ListValue* language_list = new ListValue();
@@ -225,8 +225,8 @@
     const LanguagePair& pair = language_map[display_names[i]];
     DictionaryValue* dictionary = new DictionaryValue();
     dictionary->SetString("code",  pair.first);
-    dictionary->SetString("displayName", WideToUTF16Hack(display_names[i]));
-    dictionary->SetString("nativeDisplayName", WideToUTF16Hack(pair.second));
+    dictionary->SetString("displayName", display_names[i]);
+    dictionary->SetString("nativeDisplayName", pair.second);
     language_list->Append(dictionary);
   }