| 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 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 base::TimeDelta::FromMilliseconds(kAutoLoginShortDelay + 1), | 586 base::TimeDelta::FromMilliseconds(kAutoLoginShortDelay + 1), |
| 587 runner.QuitClosure()); | 587 runner.QuitClosure()); |
| 588 runner.Run(); | 588 runner.Run(); |
| 589 | 589 |
| 590 profile_prepared_observer.Wait(); | 590 profile_prepared_observer.Wait(); |
| 591 | 591 |
| 592 // Wait for login tasks to complete. | 592 // Wait for login tasks to complete. |
| 593 content::RunAllPendingInMessageLoop(); | 593 content::RunAllPendingInMessageLoop(); |
| 594 } | 594 } |
| 595 | 595 |
| 596 // See http://crbug.com/654719 |
| 596 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 597 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
| 597 LoginStopsAutoLogin) { | 598 DISABLED_LoginStopsAutoLogin) { |
| 598 // Set up mocks to check login success. | 599 // Set up mocks to check login success. |
| 599 UserContext user_context(account_id_); | 600 UserContext user_context(account_id_); |
| 600 user_context.SetKey(Key(kPassword)); | 601 user_context.SetKey(Key(kPassword)); |
| 601 user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail()); | 602 user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail()); |
| 602 ExpectSuccessfulLogin(user_context); | 603 ExpectSuccessfulLogin(user_context); |
| 603 | 604 |
| 604 existing_user_controller()->OnSigninScreenReady(); | 605 existing_user_controller()->OnSigninScreenReady(); |
| 605 SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay); | 606 SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay); |
| 606 EXPECT_TRUE(auto_login_timer()); | 607 EXPECT_TRUE(auto_login_timer()); |
| 607 | 608 |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 757 PRE_TestLoadingPublicUsersFromLocalState) { | 758 PRE_TestLoadingPublicUsersFromLocalState) { |
| 758 // First run propagates public accounts and stores them in Local State. | 759 // First run propagates public accounts and stores them in Local State. |
| 759 } | 760 } |
| 760 | 761 |
| 761 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 762 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
| 762 TestLoadingPublicUsersFromLocalState) { | 763 TestLoadingPublicUsersFromLocalState) { |
| 763 // Second run loads list of public accounts from Local State. | 764 // Second run loads list of public accounts from Local State. |
| 764 } | 765 } |
| 765 | 766 |
| 766 } // namespace chromeos | 767 } // namespace chromeos |
| OLD | NEW |