Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_password_browsertest.cc

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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_manager::User* user = UserManager::Get()->GetUsers().at(0); 81 const user_manager::User* user = UserManager::Get()->GetUsers().at(0);
(...skipping 26 matching lines...) Expand all
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_manager::User* supervised_user = 126 const user_manager::User* supervised_user =
127 UserManager::Get()->GetUsers().at(0); 127 UserManager::Get()->GetUsers().at(0);
128 128
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 IN_PROC_BROWSER_TEST_F( 173 IN_PROC_BROWSER_TEST_F(
174 SupervisedUserPasswordTest, 174 SupervisedUserPasswordTest,
175 DISABLED_PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { 175 DISABLED_PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) {
176 PrepareUsers(); 176 PrepareUsers();
177 } 177 }
178 178
179 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 179 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
180 DISABLED_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { 180 DISABLED_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) {
181 StartFlowLoginAsManager(); 181 StartFlowLoginAsManager();
182 FillNewUserData(kTestSupervisedUserDisplayName); 182 FillNewUserData(kTestSupervisedUserDisplayName);
183 StartUserCreation("managed-user-creation-next-button", 183 StartUserCreation("supervised-user-creation-next-button",
184 kTestSupervisedUserDisplayName); 184 kTestSupervisedUserDisplayName);
185 } 185 }
186 186
187 // Supervised user signs in, get sync notification about password update, and 187 // Supervised user signs in, get sync notification about password update, and
188 // schedules password migration. 188 // schedules password migration.
189 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 189 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
190 DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) { 190 DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) {
191 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); 191 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
192 192
193 const user_manager::User* user = UserManager::Get()->GetUsers().at(0); 193 const user_manager::User* user = UserManager::Get()->GetUsers().at(0);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 // should be attempted. 254 // should be attempted.
255 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 255 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
256 DISABLED_PasswordChangeUserAndManagerTest) { 256 DISABLED_PasswordChangeUserAndManagerTest) {
257 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); 257 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
258 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); 258 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0);
259 SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); 259 SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName);
260 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); 260 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
261 } 261 }
262 262
263 } // namespace chromeos 263 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698