Fix sign-in error strings.

chrome/browser/signin/signin_error_notifier_ash_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/signin/signin_error_notifier_ash.h"
 
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
@@ skipping 20 matching lines @@
 #include "ui/gfx/screen.h"
 #include "ui/gfx/screen_type_delegate.h"
 #endif
 
 namespace ash {
 namespace test {
 
 namespace {
 
 static const char kTestAccountId[] = "testuser@test.com";
+static const char kTestUsername[] = "testuser@test.com";
 
 // Notification ID corresponding to kProfileSigninNotificationId +
 // kTestAccountId.
 static const std::string kNotificationId =
     "chrome://settings/signin/testuser@test.com";
 }
 
 #if !defined(OS_CHROMEOS)
 class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate {
  public:
@@ skipping 72 matching lines @@
   }
   ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
 }
 
 TEST_F(SigninErrorNotifierTest, ErrorAuthStatusProvider) {
   {
     FakeAuthStatusProvider provider(error_controller_);
     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.
     ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
   }
   // All providers should be removed now.
   ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
 }
 
 TEST_F(SigninErrorNotifierTest, AuthStatusProviderErrorTransition) {
   {
     FakeAuthStatusProvider provider0(error_controller_);
     FakeAuthStatusProvider provider1(error_controller_);
     provider0.SetAuthError(
         kTestAccountId,
+        kTestUsername,
         GoogleServiceAuthError(
             GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
     ASSERT_TRUE(notification_ui_manager_->FindById(kNotificationId));
 
     base::string16 message;
     GetMessage(&message);
     ASSERT_FALSE(message.empty());
 
     // 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));
 
     base::string16 new_message;
     GetMessage(&new_message);
     ASSERT_FALSE(new_message.empty());
 
     ASSERT_NE(new_message, message);
 
     provider1.SetAuthError(
-        kTestAccountId, GoogleServiceAuthError::AuthErrorNone());
+        kTestAccountId, kTestUsername, GoogleServiceAuthError::AuthErrorNone());
     ASSERT_FALSE(notification_ui_manager_->FindById(kNotificationId));
   }
 }
 
 // Verify that SigninErrorNotifier ignores certain errors.
 TEST_F(SigninErrorNotifierTest, AuthStatusEnumerateAllErrors) {
   typedef struct {
     GoogleServiceAuthError::State error_state;
     bool is_error;
   } ErrorTableEntry;
@@ skipping 12 matching lines @@
     { GoogleServiceAuthError::HOSTED_NOT_ALLOWED, true },
     { GoogleServiceAuthError::UNEXPECTED_SERVICE_RESPONSE, true },
     { GoogleServiceAuthError::SERVICE_ERROR, true },
   };
   COMPILE_ASSERT(ARRAYSIZE_UNSAFE(table) == GoogleServiceAuthError::NUM_STATES,
       kTable_size_does_not_match_number_of_auth_error_types);
 
   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);
     ASSERT_EQ(table[i].is_error, notification != NULL);
     if (table[i].is_error) {
       EXPECT_FALSE(notification->title().empty());
       EXPECT_FALSE(notification->message().empty());
       EXPECT_EQ((size_t)1, notification->buttons().size());
     }
   }
 }
 
 }  // namespace test
 }  // namespace ash