| 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/run_loop.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 kUSLayout).c_str())) { | 408 kUSLayout).c_str())) { |
| 409 LOG(ERROR) << "Actual value of " << kKeyboardSelect << ":\n" | 409 LOG(ERROR) << "Actual value of " << kKeyboardSelect << ":\n" |
| 410 << DumpOptions(kKeyboardSelect); | 410 << DumpOptions(kKeyboardSelect); |
| 411 } | 411 } |
| 412 | 412 |
| 413 // Note, that sort order is locale-specific, but is unlikely to change. | 413 // Note, that sort order is locale-specific, but is unlikely to change. |
| 414 // Especially for keyboard layouts. | 414 // Especially for keyboard layouts. |
| 415 EXPECT_EQ(expected_keyboard_select, DumpOptions(kKeyboardSelect)); | 415 EXPECT_EQ(expected_keyboard_select, DumpOptions(kKeyboardSelect)); |
| 416 | 416 |
| 417 // Shut down the display host. | 417 // Shut down the display host. |
| 418 LoginDisplayHost::default_host()->Finalize(); | 418 LoginDisplayHost::default_host()->Finalize(base::OnceClosure()); |
| 419 base::RunLoop().RunUntilIdle(); | 419 base::RunLoop().RunUntilIdle(); |
| 420 | 420 |
| 421 // Clear the locale pref so the statistics provider is pinged next time. | 421 // Clear the locale pref so the statistics provider is pinged next time. |
| 422 g_browser_process->local_state()->SetString(prefs::kApplicationLocale, | 422 g_browser_process->local_state()->SetString(prefs::kApplicationLocale, |
| 423 std::string()); | 423 std::string()); |
| 424 } | 424 } |
| 425 | 425 |
| 426 IN_PROC_BROWSER_TEST_P(OobeLocalizationTest, DISABLED_LocalizationTest) { | 426 IN_PROC_BROWSER_TEST_P(OobeLocalizationTest, DISABLED_LocalizationTest) { |
| 427 RunLocalizationTest(); | 427 RunLocalizationTest(); |
| 428 } | 428 } |
| 429 | 429 |
| 430 INSTANTIATE_TEST_CASE_P( | 430 INSTANTIATE_TEST_CASE_P( |
| 431 StructSequence, | 431 StructSequence, |
| 432 OobeLocalizationTest, | 432 OobeLocalizationTest, |
| 433 testing::Range(&oobe_localization_test_parameters[0], | 433 testing::Range(&oobe_localization_test_parameters[0], |
| 434 &oobe_localization_test_parameters[arraysize( | 434 &oobe_localization_test_parameters[arraysize( |
| 435 oobe_localization_test_parameters)])); | 435 oobe_localization_test_parameters)])); |
| 436 } // namespace chromeos | 436 } // namespace chromeos |
| OLD | NEW |