| 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } | 282 } |
| 283 | 283 |
| 284 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest, | 284 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest, |
| 285 ExistingUserLoginForbidden) { | 285 ExistingUserLoginForbidden) { |
| 286 UserContext user_context(account_id_); | 286 UserContext user_context(account_id_); |
| 287 user_context.SetKey(Key(kPassword)); | 287 user_context.SetKey(Key(kPassword)); |
| 288 user_context.SetUserIDHash(account_id_.GetUserEmail()); | 288 user_context.SetUserIDHash(account_id_.GetUserEmail()); |
| 289 existing_user_controller()->Login(user_context, SigninSpecifics()); | 289 existing_user_controller()->Login(user_context, SigninSpecifics()); |
| 290 } | 290 } |
| 291 | 291 |
| 292 // Per http://crbug.com/603735, NewUserLoginForbidden fails. |
| 293 #if defined(LINUX) |
| 294 #define MAYBE_NewUserLoginForbidden DISABLED_NewUserLoginForbidden |
| 295 #else |
| 296 #define MAYBE_NewUserLoginForbidden NewUserLoginForbidden |
| 297 #endif |
| 292 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest, | 298 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest, |
| 293 NewUserLoginForbidden) { | 299 MAYBE_NewUserLoginForbidden) { |
| 294 UserContext user_context(account_id_); | 300 UserContext user_context(account_id_); |
| 295 user_context.SetKey(Key(kPassword)); | 301 user_context.SetKey(Key(kPassword)); |
| 296 user_context.SetUserIDHash(account_id_.GetUserEmail()); | 302 user_context.SetUserIDHash(account_id_.GetUserEmail()); |
| 297 existing_user_controller()->CompleteLogin(user_context); | 303 existing_user_controller()->CompleteLogin(user_context); |
| 298 } | 304 } |
| 299 | 305 |
| 300 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest, | 306 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest, |
| 301 GuestLoginForbidden) { | 307 GuestLoginForbidden) { |
| 302 existing_user_controller()->Login( | 308 existing_user_controller()->Login( |
| 303 UserContext(user_manager::USER_TYPE_GUEST, EmptyAccountId()), | 309 UserContext(user_manager::USER_TYPE_GUEST, EmptyAccountId()), |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 732 PRE_TestLoadingPublicUsersFromLocalState) { | 738 PRE_TestLoadingPublicUsersFromLocalState) { |
| 733 // First run propagates public accounts and stores them in Local State. | 739 // First run propagates public accounts and stores them in Local State. |
| 734 } | 740 } |
| 735 | 741 |
| 736 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 742 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
| 737 TestLoadingPublicUsersFromLocalState) { | 743 TestLoadingPublicUsersFromLocalState) { |
| 738 // Second run loads list of public accounts from Local State. | 744 // Second run loads list of public accounts from Local State. |
| 739 } | 745 } |
| 740 | 746 |
| 741 } // namespace chromeos | 747 } // namespace chromeos |
| OLD | NEW |