| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 | 61 |
| 62 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 62 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 63 DISABLED_PRE_PRE_PRE_PasswordChangeFromUserTest) { | 63 DISABLED_PRE_PRE_PRE_PasswordChangeFromUserTest) { |
| 64 PrepareUsers(); | 64 PrepareUsers(); |
| 65 } | 65 } |
| 66 | 66 |
| 67 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 67 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 68 DISABLED_PRE_PRE_PasswordChangeFromUserTest) { | 68 DISABLED_PRE_PRE_PasswordChangeFromUserTest) { |
| 69 StartFlowLoginAsManager(); | 69 StartFlowLoginAsManager(); |
| 70 FillNewUserData(kTestSupervisedUserDisplayName); | 70 FillNewUserData(kTestSupervisedUserDisplayName); |
| 71 StartUserCreation("managed-user-creation-next-button", | 71 StartUserCreation("supervised-user-creation-next-button", |
| 72 kTestSupervisedUserDisplayName); | 72 kTestSupervisedUserDisplayName); |
| 73 } | 73 } |
| 74 | 74 |
| 75 // Supervised user signs in, get sync notification about password update, and | 75 // Supervised user signs in, get sync notification about password update, and |
| 76 // schedules password migration. | 76 // schedules password migration. |
| 77 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 77 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 78 DISABLED_PRE_PasswordChangeFromUserTest) { | 78 DISABLED_PRE_PasswordChangeFromUserTest) { |
| 79 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); | 79 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); |
| 80 | 80 |
| 81 const User* user = UserManager::Get()->GetUsers().at(0); | 81 const User* user = UserManager::Get()->GetUsers().at(0); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 108 | 108 |
| 109 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 109 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 110 DISABLED_PRE_PRE_PRE_PasswordChangeFromManagerTest) { | 110 DISABLED_PRE_PRE_PRE_PasswordChangeFromManagerTest) { |
| 111 PrepareUsers(); | 111 PrepareUsers(); |
| 112 } | 112 } |
| 113 | 113 |
| 114 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 114 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 115 DISABLED_PRE_PRE_PasswordChangeFromManagerTest) { | 115 DISABLED_PRE_PRE_PasswordChangeFromManagerTest) { |
| 116 StartFlowLoginAsManager(); | 116 StartFlowLoginAsManager(); |
| 117 FillNewUserData(kTestSupervisedUserDisplayName); | 117 FillNewUserData(kTestSupervisedUserDisplayName); |
| 118 StartUserCreation("managed-user-creation-next-button", | 118 StartUserCreation("supervised-user-creation-next-button", |
| 119 kTestSupervisedUserDisplayName); | 119 kTestSupervisedUserDisplayName); |
| 120 } | 120 } |
| 121 | 121 |
| 122 // Manager signs in, gets sync notification about supervised user password | 122 // Manager signs in, gets sync notification about supervised user password |
| 123 // update, and performs migration. | 123 // update, and performs migration. |
| 124 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 124 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 125 DISABLED_PRE_PasswordChangeFromManagerTest) { | 125 DISABLED_PRE_PasswordChangeFromManagerTest) { |
| 126 const User* supervised_user = UserManager::Get()->GetUsers().at(0); | 126 const User* supervised_user = UserManager::Get()->GetUsers().at(0); |
| 127 | 127 |
| 128 SigninAsManager(1); | 128 SigninAsManager(1); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 IN_PROC_BROWSER_TEST_F( | 172 IN_PROC_BROWSER_TEST_F( |
| 173 SupervisedUserPasswordTest, | 173 SupervisedUserPasswordTest, |
| 174 DISABLED_PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { | 174 DISABLED_PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { |
| 175 PrepareUsers(); | 175 PrepareUsers(); |
| 176 } | 176 } |
| 177 | 177 |
| 178 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 178 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 179 DISABLED_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { | 179 DISABLED_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { |
| 180 StartFlowLoginAsManager(); | 180 StartFlowLoginAsManager(); |
| 181 FillNewUserData(kTestSupervisedUserDisplayName); | 181 FillNewUserData(kTestSupervisedUserDisplayName); |
| 182 StartUserCreation("managed-user-creation-next-button", | 182 StartUserCreation("supervised-user-creation-next-button", |
| 183 kTestSupervisedUserDisplayName); | 183 kTestSupervisedUserDisplayName); |
| 184 } | 184 } |
| 185 | 185 |
| 186 // Supervised user signs in, get sync notification about password update, and | 186 // Supervised user signs in, get sync notification about password update, and |
| 187 // schedules password migration. | 187 // schedules password migration. |
| 188 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 188 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 189 DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) { | 189 DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) { |
| 190 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); | 190 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); |
| 191 | 191 |
| 192 const User* user = UserManager::Get()->GetUsers().at(0); | 192 const User* user = UserManager::Get()->GetUsers().at(0); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 // should be attempted. | 252 // should be attempted. |
| 253 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, | 253 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
| 254 DISABLED_PasswordChangeUserAndManagerTest) { | 254 DISABLED_PasswordChangeUserAndManagerTest) { |
| 255 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); | 255 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); |
| 256 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); | 256 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); |
| 257 SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); | 257 SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); |
| 258 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); | 258 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); |
| 259 } | 259 } |
| 260 | 260 |
| 261 } // namespace chromeos | 261 } // namespace chromeos |
| OLD | NEW |