| 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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 EXPECT_TRUE(auto_login_timer()->IsRunning()); | 536 EXPECT_TRUE(auto_login_timer()->IsRunning()); |
| 537 | 537 |
| 538 // Unset the policy. | 538 // Unset the policy. |
| 539 SetAutoLoginPolicy("", 0); | 539 SetAutoLoginPolicy("", 0); |
| 540 EXPECT_TRUE(!auto_login_account_id().is_valid()); | 540 EXPECT_TRUE(!auto_login_account_id().is_valid()); |
| 541 EXPECT_EQ(0, auto_login_delay()); | 541 EXPECT_EQ(0, auto_login_delay()); |
| 542 ASSERT_TRUE(auto_login_timer()); | 542 ASSERT_TRUE(auto_login_timer()); |
| 543 EXPECT_FALSE(auto_login_timer()->IsRunning()); | 543 EXPECT_FALSE(auto_login_timer()->IsRunning()); |
| 544 } | 544 } |
| 545 | 545 |
| 546 // Disable since the flake from this test makes it hard to track down other |
| 547 // problems on the bots. |
| 548 // See https://crbug.com/644205 or https://crbug.com/516015 . |
| 546 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 549 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
| 547 AutoLoginNoDelay) { | 550 DISABLED_AutoLoginNoDelay) { |
| 548 // Set up mocks to check login success. | 551 // Set up mocks to check login success. |
| 549 UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT, | 552 UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT, |
| 550 public_session_account_id_); | 553 public_session_account_id_); |
| 551 user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail()); | 554 user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail()); |
| 552 ExpectSuccessfulLogin(user_context); | 555 ExpectSuccessfulLogin(user_context); |
| 553 existing_user_controller()->OnSigninScreenReady(); | 556 existing_user_controller()->OnSigninScreenReady(); |
| 554 | 557 |
| 555 // Start auto-login and wait for login tasks to complete. | 558 // Start auto-login and wait for login tasks to complete. |
| 556 SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginNoDelay); | 559 SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginNoDelay); |
| 557 content::RunAllPendingInMessageLoop(); | 560 content::RunAllPendingInMessageLoop(); |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 PRE_TestLoadingPublicUsersFromLocalState) { | 757 PRE_TestLoadingPublicUsersFromLocalState) { |
| 755 // First run propagates public accounts and stores them in Local State. | 758 // First run propagates public accounts and stores them in Local State. |
| 756 } | 759 } |
| 757 | 760 |
| 758 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 761 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
| 759 TestLoadingPublicUsersFromLocalState) { | 762 TestLoadingPublicUsersFromLocalState) { |
| 760 // Second run loads list of public accounts from Local State. | 763 // Second run loads list of public accounts from Local State. |
| 761 } | 764 } |
| 762 | 765 |
| 763 } // namespace chromeos | 766 } // namespace chromeos |
| OLD | NEW |