Index: chrome/browser/signin/signin_error_notifier_ash_unittest.cc |
diff --git a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc |
index 2f8d987ebc6801f4e7a5cce75c8c8b60b6f8c74c..bc38573963945fbbc7388facd4b14515b1d878b9 100644 |
--- a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc |
+++ b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc |
@@ -37,6 +37,7 @@ namespace test { |
namespace { |
static const char kTestAccountId[] = "testuser@test.com"; |
+static const char kTestUsername[] = "testuser@test.com"; |
// Notification ID corresponding to kProfileSigninNotificationId + |
// kTestAccountId. |
@@ -128,8 +129,11 @@ TEST_F(SigninErrorNotifierTest, ErrorAuthStatusProvider) { |
ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId)); |
{ |
FakeAuthStatusProvider error_provider(error_controller_); |
- error_provider.SetAuthError(kTestAccountId, GoogleServiceAuthError( |
- GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS)); |
+ error_provider.SetAuthError( |
+ kTestAccountId, |
+ kTestUsername, |
+ GoogleServiceAuthError( |
+ GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS)); |
ASSERT_TRUE(notification_ui_manager_->FindById(kNotificationId)); |
} |
// error_provider is removed now that we've left that scope. |
@@ -154,6 +158,7 @@ TEST_F(SigninErrorNotifierTest, MAYBE_AuthStatusProviderErrorTransition) { |
FakeAuthStatusProvider provider1(error_controller_); |
provider0.SetAuthError( |
kTestAccountId, |
+ kTestUsername, |
GoogleServiceAuthError( |
GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS)); |
ASSERT_TRUE(notification_ui_manager_->FindById(kNotificationId)); |
@@ -165,10 +170,13 @@ TEST_F(SigninErrorNotifierTest, MAYBE_AuthStatusProviderErrorTransition) { |
// Now set another auth error and clear the original. |
provider1.SetAuthError( |
kTestAccountId, |
+ kTestUsername, |
GoogleServiceAuthError( |
GoogleServiceAuthError::UNEXPECTED_SERVICE_RESPONSE)); |
provider0.SetAuthError( |
- kTestAccountId, GoogleServiceAuthError::AuthErrorNone()); |
+ kTestAccountId, |
+ kTestUsername, |
+ GoogleServiceAuthError::AuthErrorNone()); |
ASSERT_TRUE(notification_ui_manager_->FindById(kNotificationId)); |
@@ -179,7 +187,7 @@ TEST_F(SigninErrorNotifierTest, MAYBE_AuthStatusProviderErrorTransition) { |
ASSERT_NE(new_message, message); |
provider1.SetAuthError( |
- kTestAccountId, GoogleServiceAuthError::AuthErrorNone()); |
+ kTestAccountId, kTestUsername, GoogleServiceAuthError::AuthErrorNone()); |
ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId)); |
} |
} |
@@ -214,6 +222,7 @@ TEST_F(SigninErrorNotifierTest, AuthStatusEnumerateAllErrors) { |
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(table); ++i) { |
FakeAuthStatusProvider provider(error_controller_); |
provider.SetAuthError(kTestAccountId, |
+ kTestUsername, |
GoogleServiceAuthError(table[i].error_state)); |
const Notification* notification = notification_ui_manager_-> |
FindById(kNotificationId); |