Index: chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc b/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc |
index 7b2dd95292c51930c1a4613841450d7074136f34..238debff03de74ab8d1d7f1c5c3b34a4dda67e6e 100644 |
--- a/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc |
+++ b/chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc |
@@ -60,12 +60,12 @@ class SupervisedUserPasswordManagerTest : public ManagedUserTestBase { |
}; |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PRE_PRE_PasswordChangeFromUserTest) { |
+ DISABLED_PRE_PRE_PRE_PasswordChangeFromUserTest) { |
PrepareUsers(); |
} |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PRE_PasswordChangeFromUserTest) { |
+ DISABLED_PRE_PRE_PasswordChangeFromUserTest) { |
StartFlowLoginAsManager(); |
FillNewUserData(kTestSupervisedUserDisplayName); |
StartUserCreation("managed-user-creation-next-button", |
@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
// Supervised user signs in, get sync notification about password update, and |
// schedules password migration. |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PasswordChangeFromUserTest) { |
+ DISABLED_PRE_PasswordChangeFromUserTest) { |
SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); |
const User* user = UserManager::Get()->GetUsers().at(0); |
@@ -98,7 +98,8 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
// Supervised user signs in for second time, and actual password migration takes |
// place. |
-IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, PasswordChangeFromUserTest) { |
+IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
+ DISABLED_PasswordChangeFromUserTest) { |
EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); |
EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(1); |
SigninAsSupervisedUser(false, 0, kTestSupervisedUserDisplayName); |
@@ -106,12 +107,12 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, PasswordChangeFromUserTest) { |
} |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PRE_PRE_PasswordChangeFromManagerTest) { |
+ DISABLED_PRE_PRE_PRE_PasswordChangeFromManagerTest) { |
PrepareUsers(); |
} |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PRE_PasswordChangeFromManagerTest) { |
+ DISABLED_PRE_PRE_PasswordChangeFromManagerTest) { |
StartFlowLoginAsManager(); |
FillNewUserData(kTestSupervisedUserDisplayName); |
StartUserCreation("managed-user-creation-next-button", |
@@ -121,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
// Manager signs in, gets sync notification about supervised user password |
// update, and performs migration. |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PasswordChangeFromManagerTest) { |
+ DISABLED_PRE_PasswordChangeFromManagerTest) { |
const User* managed_user = UserManager::Get()->GetUsers().at(0); |
SigninAsManager(1); |
@@ -161,20 +162,21 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
// After that supervised user signs in, and no password change happens. |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PasswordChangeFromManagerTest) { |
+ DISABLED_PasswordChangeFromManagerTest) { |
EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); |
EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); |
SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); |
testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); |
} |
-IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { |
+IN_PROC_BROWSER_TEST_F( |
+ SupervisedUserPasswordTest, |
+ DISABLED_PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { |
PrepareUsers(); |
} |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { |
+ DISABLED_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { |
StartFlowLoginAsManager(); |
FillNewUserData(kTestSupervisedUserDisplayName); |
StartUserCreation("managed-user-creation-next-button", |
@@ -184,7 +186,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
// Supervised user signs in, get sync notification about password update, and |
// schedules password migration. |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PRE_PasswordChangeUserAndManagerTest) { |
+ DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) { |
SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); |
const User* user = UserManager::Get()->GetUsers().at(0); |
@@ -208,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
// After that manager signs in, and also detects password change. Manager |
// performs the migration. |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PRE_PasswordChangeUserAndManagerTest) { |
+ DISABLED_PRE_PasswordChangeUserAndManagerTest) { |
const User* managed_user = UserManager::Get()->GetUsers().at(0); |
SigninAsManager(1); |
@@ -249,7 +251,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
// When supervised user signs in, password is already migrated, so no migration |
// should be attempted. |
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, |
- PasswordChangeUserAndManagerTest) { |
+ DISABLED_PasswordChangeUserAndManagerTest) { |
EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); |
EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); |
SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); |