| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/run_loop.h" |
| 9 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| 10 #include "base/task_runner.h" | 11 #include "base/task_runner.h" |
| 11 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 12 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
| 13 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
| 14 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
| 15 #include "chrome/browser/chromeos/customization/customization_document.h" | 16 #include "chrome/browser/chromeos/customization/customization_document.h" |
| 16 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 17 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 17 #include "chrome/browser/chromeos/login/login_manager_test.h" | 18 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 18 #include "chrome/browser/chromeos/login/login_wizard.h" | 19 #include "chrome/browser/chromeos/login/login_wizard.h" |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 LOG(ERROR) << "Actual value of " << kKeyboardSelect << ":\n" | 411 LOG(ERROR) << "Actual value of " << kKeyboardSelect << ":\n" |
| 411 << DumpOptions(kKeyboardSelect); | 412 << DumpOptions(kKeyboardSelect); |
| 412 } | 413 } |
| 413 | 414 |
| 414 // Note, that sort order is locale-specific, but is unlikely to change. | 415 // Note, that sort order is locale-specific, but is unlikely to change. |
| 415 // Especially for keyboard layouts. | 416 // Especially for keyboard layouts. |
| 416 EXPECT_EQ(expected_keyboard_select, DumpOptions(kKeyboardSelect)); | 417 EXPECT_EQ(expected_keyboard_select, DumpOptions(kKeyboardSelect)); |
| 417 | 418 |
| 418 // Shut down the display host. | 419 // Shut down the display host. |
| 419 LoginDisplayHost::default_host()->Finalize(); | 420 LoginDisplayHost::default_host()->Finalize(); |
| 420 base::MessageLoopForUI::current()->RunUntilIdle(); | 421 base::RunLoop().RunUntilIdle(); |
| 421 | 422 |
| 422 // Clear the locale pref so the statistics provider is pinged next time. | 423 // Clear the locale pref so the statistics provider is pinged next time. |
| 423 g_browser_process->local_state()->SetString(prefs::kApplicationLocale, | 424 g_browser_process->local_state()->SetString(prefs::kApplicationLocale, |
| 424 std::string()); | 425 std::string()); |
| 425 } | 426 } |
| 426 | 427 |
| 427 IN_PROC_BROWSER_TEST_P(OobeLocalizationTest, DISABLED_LocalizationTest) { | 428 IN_PROC_BROWSER_TEST_P(OobeLocalizationTest, DISABLED_LocalizationTest) { |
| 428 RunLocalizationTest(); | 429 RunLocalizationTest(); |
| 429 } | 430 } |
| 430 | 431 |
| 431 INSTANTIATE_TEST_CASE_P( | 432 INSTANTIATE_TEST_CASE_P( |
| 432 StructSequence, | 433 StructSequence, |
| 433 OobeLocalizationTest, | 434 OobeLocalizationTest, |
| 434 testing::Range(&oobe_localization_test_parameters[0], | 435 testing::Range(&oobe_localization_test_parameters[0], |
| 435 &oobe_localization_test_parameters[arraysize( | 436 &oobe_localization_test_parameters[arraysize( |
| 436 oobe_localization_test_parameters)])); | 437 oobe_localization_test_parameters)])); |
| 437 } // namespace chromeos | 438 } // namespace chromeos |
| OLD | NEW |