Index: chrome/browser/chromeos/login/saml/saml_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc |
index a0e34ba9ca965fc51527fe23e8ebdf972444f354..45df2c0a8508531555df15d088292a55e92cb613 100644 |
--- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc |
+++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc |
@@ -575,7 +575,7 @@ IN_PROC_BROWSER_TEST_F(SamlTest, FailToRetrieveAutenticatedUserEmailAddress) { |
SetSignFormField("Password", "fake_password"); |
ExecuteJsInSigninFrame("document.getElementById('Submit').click();"); |
- EXPECT_EQ(l10n_util::GetStringUTF8(IDS_LOGIN_FATAL_ERROR_NO_EMAIL), |
+ EXPECT_EQ(l10n_util::GetStringUTF8(IDS_LOGIN_FATAL_ERROR_NO_ACCOUNT_DETAILS), |
WaitForAndGetFatalErrorMessage()); |
} |
@@ -855,7 +855,8 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, PRE_SAMLNoLimit) { |
// Remove the offline login time limit for SAML users. |
SetSAMLOfflineSigninTimeLimitPolicy(-1); |
- LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie1, kTestAuthLSIDCookie1); |
+ LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie1, |
+ kTestAuthLSIDCookie1); |
bartfab (slow)
2014/10/21 14:47:47
Nit: You no longer need to introduce line wrapping
Roger Tawa OOO till Jul 10th
2014/10/21 19:15:31
Done.
|
} |
// Verifies that when no offline login time limit is set, a user who |
@@ -871,7 +872,8 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, PRE_SAMLZeroLimit) { |
// Set the offline login time limit for SAML users to zero. |
SetSAMLOfflineSigninTimeLimitPolicy(0); |
- LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie1, kTestAuthLSIDCookie1); |
+ LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie1, |
bartfab (slow)
2014/10/21 14:47:47
Nit: You no longer need to introduce line wrapping
Roger Tawa OOO till Jul 10th
2014/10/21 19:15:31
Done.
|
+ kTestAuthLSIDCookie1); |
} |
// Verifies that when the offline login time limit is exceeded for a user who |
@@ -885,7 +887,8 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, SAMLZeroLimit) { |
IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, PRE_PRE_TransferCookiesAffiliated) { |
fake_saml_idp()->SetCookieValue(kSAMLIdPCookieValue1); |
- LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie1, kTestAuthLSIDCookie1); |
+ LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie1, |
bartfab (slow)
2014/10/21 14:47:47
Nit: You no longer need to introduce line wrapping
Roger Tawa OOO till Jul 10th
2014/10/21 19:15:31
Done.
|
+ kTestAuthLSIDCookie1); |
GetCookies(); |
EXPECT_EQ(kTestAuthSIDCookie1, GetCookieValue(kGAIASIDCookieName)); |
@@ -901,7 +904,8 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, PRE_TransferCookiesAffiliated) { |
fake_saml_idp()->SetCookieValue(kSAMLIdPCookieValue2); |
fake_saml_idp()->SetLoginHTMLTemplate("saml_login.html"); |
ShowGAIALoginForm(); |
- LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie2, kTestAuthLSIDCookie2); |
+ LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie2, |
bartfab (slow)
2014/10/21 14:47:47
Nit: You no longer need to introduce line wrapping
Roger Tawa OOO till Jul 10th
2014/10/21 19:15:31
Done.
|
+ kTestAuthLSIDCookie2); |
GetCookies(); |
EXPECT_EQ(kTestAuthSIDCookie1, GetCookieValue(kGAIASIDCookieName)); |
@@ -919,7 +923,8 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, TransferCookiesAffiliated) { |
ShowGAIALoginForm(); |
EnableTransferSAMLCookiesPolicy(); |
- LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie2, kTestAuthLSIDCookie2); |
+ LogInWithSAML(kFirstSAMLUserEmail, kTestAuthSIDCookie2, |
bartfab (slow)
2014/10/21 14:47:47
Nit: You no longer need to introduce line wrapping
Roger Tawa OOO till Jul 10th
2014/10/21 19:15:31
Done.
|
+ kTestAuthLSIDCookie2); |
GetCookies(); |
EXPECT_EQ(kTestAuthSIDCookie1, GetCookieValue(kGAIASIDCookieName)); |