Allow country-specific languages in UI list at OOBE.

chrome/browser/chromeos/login/oobe_localization_browsertest.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 "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 194 matching lines @@
       "    } else {\n"
       "      result += '__NO_VALUE__';\n"
       "    }\n"
       "  }\n"
       "  return result;\n"
       "})()\n",
       select_id);
   return checker.GetString(expression);
 }
 
+std::string TranslateXKB2Extension(const std::string& src) {
+  std::string result(src);
+  if (!extension_ime_util::UseWrappedExtensionKeyboardLayouts())
+    return result;
+  // Modifies the expected keyboard select control options for the new
+  // extension based xkb id.
+  size_t pos = 0;
+  std::string repl_old = "xkb:";
+  std::string repl_new =
+      extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:");
+  while ((pos = result.find(repl_old, pos)) != std::string::npos) {
+    result.replace(pos, repl_old.length(), repl_new);
+    pos += repl_new.length();
+  }
+  return result;
+}
+
 void OobeLocalizationTest::RunLocalizationTest(
     const std::string& initial_locale,
     const std::string& keyboard_layout,
     const std::string& expected_locale,
     const std::string& expected_keyboard_layout,
     const std::string& expected_keyboard_select_control) {
   statistics_provider_->set_locale(initial_locale);
   statistics_provider_->set_keyboard_layout(keyboard_layout);
 
   // Initialize StartupCustomizationDocument with fake statistics provider.
   StartupCustomizationDocument::GetInstance()->Init(
       statistics_provider_.get());
 
   g_browser_process->local_state()->SetString(
       prefs::kHardwareKeyboardLayout, keyboard_layout);
 
   input_method::InputMethodManager::Get()
       ->GetInputMethodUtil()
       ->InitXkbInputMethodsForTesting();
 
-  std::string expected_keyboard_select = expected_keyboard_select_control;
-  if (extension_ime_util::UseWrappedExtensionKeyboardLayouts()) {
-    // Modifies the expected keyboard select control options for the new
-    // extension based xkb id.
-    size_t pos = 0;
-    std::string repl_old = "xkb:";
-    std::string repl_new =
-        extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:");
-    while ((pos = expected_keyboard_select.find(repl_old, pos)) !=
-           std::string::npos) {
-      expected_keyboard_select.replace(pos, repl_old.length(), repl_new);
-      pos += repl_new.length();
-    }
-  }
+  const std::string expected_keyboard_select =
+      TranslateXKB2Extension(expected_keyboard_select_control);
 
   // Bring up the OOBE network screen.
   chromeos::ShowLoginWizard(chromeos::WizardController::kNetworkScreenName);
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
       content::NotificationService::AllSources()).Wait();
 
   checker.set_web_contents(static_cast<chromeos::LoginDisplayHostImpl*>(
                            chromeos::LoginDisplayHostImpl::default_host())->
                            GetOobeUI()->web_ui()->GetWebContents());
 
   VerifyInitialOptions(kLocaleSelect, expected_locale.c_str(), true);
   VerifyInitialOptions(kKeyboardSelect,
-                       extension_ime_util::GetInputMethodIDByKeyboardLayout(
-                           expected_keyboard_layout).c_str(),
+                       TranslateXKB2Extension(expected_keyboard_layout).c_str(),
                        false);
 
   // Make sure we have a fallback keyboard.
   VerifyOptionExists(
       kKeyboardSelect,
       extension_ime_util::GetInputMethodIDByKeyboardLayout(kUSLayout).c_str());
 
   // Note, that sort order is locale-specific, but is unlikely to change.
   // Especially for keyboard layouts.
   EXPECT_EQ(expected_keyboard_select, DumpOptions(kKeyboardSelect));
@@ skipping 54 matching lines @@
 IN_PROC_BROWSER_TEST_F(OobeLocalizationTest, NetworkScreenMultipleLocales) {
   RunLocalizationTest("es,en-US,nl", "xkb:be::nld",
                       "es,en-US,nl", "xkb:be::nld",
                       "xkb:be::nld,[xkb:es::spa,xkb:latam::spa,xkb:us::eng]");
 
   RunLocalizationTest("ru,de", "xkb:ru::rus",
                       "ru,de", kUSLayout,
                       "xkb:us::eng");
 }
 
+IN_PROC_BROWSER_TEST_F(OobeLocalizationTest, NetworkScreenRegionalLocales) {
+  RunLocalizationTest("fr-CH,it-CH,de-CH",
+                      "xkb:fr::fra,xkb:it::ita,xkb:de::ger",
+                      "fr-CH,it-CH,de-CH",
+                      "xkb:fr::fra,xkb:it::ita,xkb:de::ger",
+                      "xkb:fr::fra,xkb:it::ita,xkb:de::ger,["
+                          "xkb:be::fra,xkb:ca::fra,xkb:ch:fr:fra,"
+                          "xkb:ca:multix:fra,xkb:us::eng"
+                      "]");
+}
+
 }  // namespace chromeos