| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
| 7 #include "chrome/browser/chromeos/input_method/input_method_persistence.h" | 7 #include "chrome/browser/chromeos/input_method/input_method_persistence.h" |
| 8 #include "chrome/browser/chromeos/language_preferences.h" | 8 #include "chrome/browser/chromeos/language_preferences.h" |
| 9 #include "chrome/browser/chromeos/login/login_manager_test.h" | 9 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 10 #include "chrome/browser/chromeos/login/startup_utils.h" | 10 #include "chrome/browser/chromeos/login/startup_utils.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 | 137 |
| 138 IN_PROC_BROWSER_TEST_F(LoginUIKeyboardTest, PRE_CheckPODScreenWithUsers) { | 138 IN_PROC_BROWSER_TEST_F(LoginUIKeyboardTest, PRE_CheckPODScreenWithUsers) { |
| 139 RegisterUser(kTestUser1); | 139 RegisterUser(kTestUser1); |
| 140 RegisterUser(kTestUser2); | 140 RegisterUser(kTestUser2); |
| 141 | 141 |
| 142 InitUserLRUInputMethod(); | 142 InitUserLRUInputMethod(); |
| 143 | 143 |
| 144 StartupUtils::MarkOobeCompleted(); | 144 StartupUtils::MarkOobeCompleted(); |
| 145 } | 145 } |
| 146 | 146 |
| 147 IN_PROC_BROWSER_TEST_F(LoginUIKeyboardTest, CheckPODScreenWithUsers) { | 147 // TODO(crbug.com/602951): Test is flaky. |
| 148 IN_PROC_BROWSER_TEST_F(LoginUIKeyboardTest, DISABLED_CheckPODScreenWithUsers) { |
| 148 js_checker().ExpectEQ("$('pod-row').pods.length", 2); | 149 js_checker().ExpectEQ("$('pod-row').pods.length", 2); |
| 149 | 150 |
| 150 EXPECT_EQ(user_input_methods[0], | 151 EXPECT_EQ(user_input_methods[0], |
| 151 input_method::InputMethodManager::Get() | 152 input_method::InputMethodManager::Get() |
| 152 ->GetActiveIMEState() | 153 ->GetActiveIMEState() |
| 153 ->GetCurrentInputMethod() | 154 ->GetCurrentInputMethod() |
| 154 .id()); | 155 .id()); |
| 155 | 156 |
| 156 std::vector<std::string> expected_input_methods; | 157 std::vector<std::string> expected_input_methods; |
| 157 Append_en_US_InputMethods(&expected_input_methods); | 158 Append_en_US_InputMethods(&expected_input_methods); |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 // Switch back. | 271 // Switch back. |
| 271 js_checker().Evaluate("$('gaia-signin').cancel()"); | 272 js_checker().Evaluate("$('gaia-signin').cancel()"); |
| 272 OobeScreenWaiter(OobeScreen::SCREEN_ACCOUNT_PICKER).Wait(); | 273 OobeScreenWaiter(OobeScreen::SCREEN_ACCOUNT_PICKER).Wait(); |
| 273 | 274 |
| 274 EXPECT_EQ(expected_input_methods, | 275 EXPECT_EQ(expected_input_methods, |
| 275 input_method::InputMethodManager::Get() | 276 input_method::InputMethodManager::Get() |
| 276 ->GetActiveIMEState() | 277 ->GetActiveIMEState() |
| 277 ->GetActiveInputMethodIds()); | 278 ->GetActiveInputMethodIds()); |
| 278 } | 279 } |
| 279 } // namespace chromeos | 280 } // namespace chromeos |
| OLD | NEW |