ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread.

chrome/browser/ui/webui/chromeos/login/l10n_util.cc

 // Copyright 2014 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/chromeos/login/l10n_util.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 250 matching lines @@
     if (insert_divider && display_name == divider16) {
       // Insert divider.
       base::DictionaryValue* dictionary = new base::DictionaryValue();
       dictionary->SetString("code", kMostRelevantLanguagesDivider);
       language_list->Append(dictionary);
       continue;
     }
     const bool markup_removal =
         base::i18n::UnadjustStringForLocaleDirection(&display_name);
     DCHECK(markup_removal);
-    const bool has_rtl_chars =
-        base::i18n::StringContainsStrongRTLChars(display_name);
-    const std::string directionality = has_rtl_chars ? "rtl" : "ltr";
+    const std::string directionality = GetLanguageDirectionality(display_name);
 
     const LanguagePair& pair = language_map[out_display_names[i]];
-    base::DictionaryValue* dictionary = new base::DictionaryValue();
-    dictionary->SetString("code", pair.first);
-    dictionary->SetString("displayName", out_display_names[i]);
-    dictionary->SetString("textDirection", directionality);
-    dictionary->SetString("nativeDisplayName", pair.second);
-    language_list->Append(dictionary);
+    language_list->Append(CreateLanguageEntry(
+        pair.first, out_display_names[i], directionality, pair.second));
   }
 
   return language_list.Pass();
 }
 
 // Invokes |callback| with a list of keyboard layouts that can be used for
 // |resolved_locale|.
 void GetKeyboardLayoutsForResolvedLocale(
     const GetKeyboardLayoutsForLocaleCallback& callback,
     const std::string& resolved_locale) {
@@ skipping 24 matching lines @@
       continue;
     input_methods_list->Append(
         CreateInputMethodsEntry(*ime, selected).release());
   }
 
   callback.Run(input_methods_list.Pass());
 }
 
 }  // namespace
 
+base::DictionaryValue* CreateLanguageEntry(
+    const std::string& language_code,
+    const base::string16& language_display_name,
+    const std::string& language_directionality,
+    const base::string16& language_native_display_name) {
+  scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue());
+  dictionary->SetString("code", language_code);
+  dictionary->SetString("displayName", language_display_name);
+  dictionary->SetString("textDirection", language_directionality);
+  dictionary->SetString("nativeDisplayName", language_native_display_name);
+  return dictionary.release();
+}
+
+const std::string GetLanguageDirectionality(
+    const base::string16& language_display_name) {
+  const bool has_rtl_chars =
+      base::i18n::StringContainsStrongRTLChars(language_display_name);
+  return has_rtl_chars ? "rtl" : "ltr";
+}
+
 const char kMostRelevantLanguagesDivider[] = "MOST_RELEVANT_LANGUAGES_DIVIDER";
 
 scoped_ptr<base::ListValue> GetUILanguageList(
     const std::vector<std::string>* most_relevant_language_codes,
     const std::string& selected) {
   ComponentExtensionIMEManager* manager =
       input_method::InputMethodManager::Get()->
           GetComponentExtensionIMEManager();
   input_method::InputMethodDescriptors descriptors =
       manager->GetXkbIMEAsInputMethodDescriptor();
@@ skipping 167 matching lines @@
 scoped_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() {
   const input_method::InputMethodDescriptor current_input_method =
       input_method::InputMethodManager::Get()
           ->GetActiveIMEState()
           ->GetCurrentInputMethod();
   return CreateInputMethodsEntry(current_input_method,
                                  current_input_method.id());
 }
 
 }  // namespace chromeos