| 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 "base/prefs/pref_service.h" | |
| 7 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/chromeos/input_method/input_method_persistence.h" | 7 #include "chrome/browser/chromeos/input_method/input_method_persistence.h" |
| 9 #include "chrome/browser/chromeos/language_preferences.h" | 8 #include "chrome/browser/chromeos/language_preferences.h" |
| 10 #include "chrome/browser/chromeos/login/login_manager_test.h" | 9 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 11 #include "chrome/browser/chromeos/login/startup_utils.h" | 10 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 12 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" | 11 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" |
| 13 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 12 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 14 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 13 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 15 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 16 #include "chromeos/chromeos_switches.h" | 15 #include "chromeos/chromeos_switches.h" |
| 16 #include "components/prefs/pref_service.h" |
| 17 #include "content/public/test/test_utils.h" | 17 #include "content/public/test/test_utils.h" |
| 18 | 18 |
| 19 namespace chromeos { | 19 namespace chromeos { |
| 20 | 20 |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 const char kTestUser1[] = "test-user1@gmail.com"; | 23 const char kTestUser1[] = "test-user1@gmail.com"; |
| 24 const char kTestUser2[] = "test-user2@gmail.com"; | 24 const char kTestUser2[] = "test-user2@gmail.com"; |
| 25 const char kTestUser3[] = "test-user3@gmail.com"; | 25 const char kTestUser3[] = "test-user3@gmail.com"; |
| 26 | 26 |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 // Switch back. | 270 // Switch back. |
| 271 js_checker().Evaluate("$('gaia-signin').cancel()"); | 271 js_checker().Evaluate("$('gaia-signin').cancel()"); |
| 272 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait(); | 272 OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait(); |
| 273 | 273 |
| 274 EXPECT_EQ(expected_input_methods, | 274 EXPECT_EQ(expected_input_methods, |
| 275 input_method::InputMethodManager::Get() | 275 input_method::InputMethodManager::Get() |
| 276 ->GetActiveIMEState() | 276 ->GetActiveIMEState() |
| 277 ->GetActiveInputMethodIds()); | 277 ->GetActiveInputMethodIds()); |
| 278 } | 278 } |
| 279 } // namespace chromeos | 279 } // namespace chromeos |
| OLD | NEW |