| 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 <string> | 5 #include <string> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 AccountId::FromUserEmailGaiaId(kUsername, kGaiaID); | 234 AccountId::FromUserEmailGaiaId(kUsername, kGaiaID); |
| 235 | 235 |
| 236 private: | 236 private: |
| 237 DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerTest); | 237 DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerTest); |
| 238 }; | 238 }; |
| 239 | 239 |
| 240 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, PRE_ExistingUserLogin) { | 240 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, PRE_ExistingUserLogin) { |
| 241 RegisterUser(account_id_.GetUserEmail()); | 241 RegisterUser(account_id_.GetUserEmail()); |
| 242 } | 242 } |
| 243 | 243 |
| 244 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) { | 244 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, DISABLED_ExistingUserLogin) { |
| 245 EXPECT_CALL(*mock_login_display_, SetUIEnabled(false)) | 245 EXPECT_CALL(*mock_login_display_, SetUIEnabled(false)) |
| 246 .Times(2); | 246 .Times(2); |
| 247 UserContext user_context(account_id_); | 247 UserContext user_context(account_id_); |
| 248 user_context.SetKey(Key(kPassword)); | 248 user_context.SetKey(Key(kPassword)); |
| 249 user_context.SetUserIDHash(account_id_.GetUserEmail()); | 249 user_context.SetUserIDHash(account_id_.GetUserEmail()); |
| 250 test::UserSessionManagerTestApi session_manager_test_api( | 250 test::UserSessionManagerTestApi session_manager_test_api( |
| 251 UserSessionManager::GetInstance()); | 251 UserSessionManager::GetInstance()); |
| 252 session_manager_test_api.InjectStubUserContext(user_context); | 252 session_manager_test_api.InjectStubUserContext(user_context); |
| 253 EXPECT_CALL(*mock_login_display_, SetUIEnabled(true)) | 253 EXPECT_CALL(*mock_login_display_, SetUIEnabled(true)) |
| 254 .Times(1); | 254 .Times(1); |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 PRE_TestLoadingPublicUsersFromLocalState) { | 754 PRE_TestLoadingPublicUsersFromLocalState) { |
| 755 // First run propagates public accounts and stores them in Local State. | 755 // First run propagates public accounts and stores them in Local State. |
| 756 } | 756 } |
| 757 | 757 |
| 758 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 758 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
| 759 TestLoadingPublicUsersFromLocalState) { | 759 TestLoadingPublicUsersFromLocalState) { |
| 760 // Second run loads list of public accounts from Local State. | 760 // Second run loads list of public accounts from Local State. |
| 761 } | 761 } |
| 762 | 762 |
| 763 } // namespace chromeos | 763 } // namespace chromeos |
| OLD | NEW |