| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 self->done = true; | 99 self->done = true; |
| 100 } | 100 } |
| 101 | 101 |
| 102 void RunSwitchLanguageTest(const std::string& locale, | 102 void RunSwitchLanguageTest(const std::string& locale, |
| 103 const std::string& expected_locale, | 103 const std::string& expected_locale, |
| 104 const bool expect_success) { | 104 const bool expect_success) { |
| 105 SwitchLanguageTestData data; | 105 SwitchLanguageTestData data; |
| 106 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 106 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
| 107 new locale_util::SwitchLanguageCallback( | 107 new locale_util::SwitchLanguageCallback( |
| 108 base::Bind(&OnLocaleSwitched, base::Unretained(&data)))); | 108 base::Bind(&OnLocaleSwitched, base::Unretained(&data)))); |
| 109 locale_util::SwitchLanguage(locale, true, callback.Pass()); | 109 locale_util::SwitchLanguage(locale, true, false, callback.Pass()); |
| 110 | 110 |
| 111 // Token writing moves control to BlockingPool and back. | 111 // Token writing moves control to BlockingPool and back. |
| 112 base::RunLoop().RunUntilIdle(); | 112 base::RunLoop().RunUntilIdle(); |
| 113 content::BrowserThread::GetBlockingPool()->FlushForTesting(); | 113 content::BrowserThread::GetBlockingPool()->FlushForTesting(); |
| 114 base::RunLoop().RunUntilIdle(); | 114 base::RunLoop().RunUntilIdle(); |
| 115 | 115 |
| 116 EXPECT_EQ(data.done, true); | 116 EXPECT_EQ(data.done, true); |
| 117 EXPECT_EQ(data.requested_locale, locale); | 117 EXPECT_EQ(data.requested_locale, locale); |
| 118 EXPECT_EQ(data.loaded_locale, expected_locale); | 118 EXPECT_EQ(data.loaded_locale, expected_locale); |
| 119 EXPECT_EQ(data.success, expect_success); | 119 EXPECT_EQ(data.success, expect_success); |
| (...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 } | 705 } |
| 706 | 706 |
| 707 // TODO(dzhioev): Add test emaulating device with wrong HWID. | 707 // TODO(dzhioev): Add test emaulating device with wrong HWID. |
| 708 | 708 |
| 709 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 | 709 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 |
| 710 | 710 |
| 711 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 19, | 711 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 19, |
| 712 add_tests_for_new_control_flow_you_just_introduced); | 712 add_tests_for_new_control_flow_you_just_introduced); |
| 713 | 713 |
| 714 } // namespace chromeos | 714 } // namespace chromeos |
| OLD | NEW |