| 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 .WillOnce(Return(mock_login_display_)); | 151 .WillOnce(Return(mock_login_display_)); |
| 152 EXPECT_CALL(*mock_login_display_host_.get(), GetNativeWindow()) | 152 EXPECT_CALL(*mock_login_display_host_.get(), GetNativeWindow()) |
| 153 .Times(1) | 153 .Times(1) |
| 154 .WillOnce(ReturnNull()); | 154 .WillOnce(ReturnNull()); |
| 155 EXPECT_CALL(*mock_login_display_host_.get(), OnPreferencesChanged()) | 155 EXPECT_CALL(*mock_login_display_host_.get(), OnPreferencesChanged()) |
| 156 .Times(1); | 156 .Times(1); |
| 157 EXPECT_CALL(*mock_login_display_, Init(_, false, true, true)) | 157 EXPECT_CALL(*mock_login_display_, Init(_, false, true, true)) |
| 158 .Times(1); | 158 .Times(1); |
| 159 } | 159 } |
| 160 | 160 |
| 161 virtual void SetUpCommandLine(CommandLine* command_line) override { | 161 virtual void SetUpCommandLine(base::CommandLine* command_line) override { |
| 162 command_line->AppendSwitch(switches::kLoginManager); | 162 command_line->AppendSwitch(switches::kLoginManager); |
| 163 } | 163 } |
| 164 | 164 |
| 165 virtual void SetUpUserManager() { | 165 virtual void SetUpUserManager() { |
| 166 // Replace the UserManager singleton with a mock. | 166 // Replace the UserManager singleton with a mock. |
| 167 mock_user_manager_ = new MockUserManager; | 167 mock_user_manager_ = new MockUserManager; |
| 168 user_manager_enabler_.reset( | 168 user_manager_enabler_.reset( |
| 169 new ScopedUserManagerEnabler(mock_user_manager_)); | 169 new ScopedUserManagerEnabler(mock_user_manager_)); |
| 170 EXPECT_CALL(*mock_user_manager_, IsKnownUser(kUsername)) | 170 EXPECT_CALL(*mock_user_manager_, IsKnownUser(kUsername)) |
| 171 .Times(AnyNumber()) | 171 .Times(AnyNumber()) |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 // First run propagates public accounts and stores them in Local State. | 747 // First run propagates public accounts and stores them in Local State. |
| 748 } | 748 } |
| 749 | 749 |
| 750 // See http://crbug.com/393704; flaky. | 750 // See http://crbug.com/393704; flaky. |
| 751 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 751 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
| 752 DISABLED_TestLoadingPublicUsersFromLocalState) { | 752 DISABLED_TestLoadingPublicUsersFromLocalState) { |
| 753 // Second run loads list of public accounts from Local State. | 753 // Second run loads list of public accounts from Local State. |
| 754 } | 754 } |
| 755 | 755 |
| 756 } // namespace chromeos | 756 } // namespace chromeos |
| OLD | NEW |