Decouple l10n_util from InputMethodUtil.

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/chromeos/cros_language_options_handler.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 167 matching lines @@
   // 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) {
      // Exclude the language which is not in |base_langauge_codes| even it has
      // input methods.
     if (std::find(base_language_codes.begin(),
                   base_language_codes.end(),
                   *iter) == base_language_codes.end()) {
       continue;
     }
-    input_method::InputMethodUtil* input_method_util =
-        input_method::GetInputMethodManager()->GetInputMethodUtil();
     const string16 display_name =
-        input_method_util->GetLanguageDisplayNameFromCode(*iter);
+        l10n_util::GetDisplayNameForLocale(*iter, app_locale, true);
     const string16 native_display_name =
-        input_method::InputMethodUtil::GetLanguageNativeDisplayNameFromCode(
-            *iter);
+        l10n_util::GetDisplayNameForLocale(*iter, *iter, true);
+
     display_names.push_back(display_name);
     language_map[display_name] =
         std::make_pair(*iter, native_display_name);
   }
   DCHECK_EQ(display_names.size(), language_map.size());
 
   // Build the list of display names, and build the language map.
   for (size_t i = 0; i < base_language_codes.size(); ++i) {
     // Skip this language if it was already added.
     if (language_codes.find(base_language_codes[i]) != language_codes.end())
@@ skipping 132 matching lines @@
 void CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback(
     const ListValue* args) {
   const std::string input_method_id = UTF16ToASCII(ExtractStringValue(args));
   const std::string action = base::StringPrintf(
       "InputMethodOptions_Open_%s", input_method_id.c_str());
   content::RecordComputedAction(action);
 }
 
 }  // namespace options
 }  // namespace chromeos