Remove wstring from l10n_util. Part 1....

chrome/browser/chromeos/input_method/input_method_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 87 matching lines @@
 // "USA" (US keyboard) when |input_method_id| is unknown.
 // Examples: "pinyin" => "Pinyin"
 //           "m17n:ar:kbd" => "kbd (m17n)"
 std::string GetInputMethodDisplayNameFromId(const std::string& input_method_id);
 
 // Converts a language code to a language display name, using the
 // current application locale. MaybeRewriteLanguageName() is called
 // internally.
 // Examples: "fi"    => "Finnish"
 //           "en-US" => "English (United States)"
-std::wstring GetLanguageDisplayNameFromCode(const std::string& language_code);
+string16 GetLanguageDisplayNameFromCode(const std::string& language_code);
 
 // Converts a language code to a language native display name.
 // MaybeRewriteLanguageName() is called internally.
 // Examples: "fi"    => "suomi" (rather than Finnish)
 //           "en-US" => "English (United States)"
-std::wstring GetLanguageNativeDisplayNameFromCode(
-    const std::string& language_code);
+string16 GetLanguageNativeDisplayNameFromCode(const std::string& language_code);
 
 // Sorts the given language codes by their corresponding language names,
 // using the unicode string comparator. Uses unstable sorting.
 void SortLanguageCodesByNames(std::vector<std::string>* language_codes);
 
 // Sorts the given input method ids by their corresponding language names,
 // using the unicode string comparator. Uses stable sorting.
 void SortInputMethodIdsByNames(std::vector<std::string>* input_method_ids);
 
 enum InputMethodType {
@@ skipping 35 matching lines @@
     const std::string& normalized_language_code,
     InputMethodType type,
     std::vector<std::string>* out_input_method_ids);
 
 void OnLocaleChanged();
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_