Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/sync/sync_ui_util_unittest.cc

 // Copyright (c) 2012 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 <set>
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
@@ skipping 26 matching lines @@
   STATUS_CASE_AUTH_ERROR,
   STATUS_CASE_PROTOCOL_ERROR,
   STATUS_CASE_PASSPHRASE_ERROR,
   STATUS_CASE_SYNCED,
   STATUS_CASE_SYNC_DISABLED_BY_POLICY,
   NUMBER_OF_STATUS_CASES
 };
 
 namespace {
 
+const char kTestGaiaId[] = "gaia-id-test_user@test.com";
 const char kTestUser[] = "test_user@test.com";
 
 #if !defined(OS_CHROMEOS)
 // Utility function to test that GetStatusLabelsForSyncGlobalError returns
 // the correct results for the given states.
 void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
                                  GoogleServiceAuthError::State error_state,
                                  bool is_signed_in,
                                  bool is_error) {
   EXPECT_CALL(*service, HasSyncSetupCompleted())
@@ skipping 188 matching lines @@
       EXPECT_CALL(service, HasSyncSetupCompleted())
                   .WillRepeatedly(Return(true));
       EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
       EXPECT_CALL(service, IsPassphraseRequired())
                   .WillRepeatedly(Return(false));
       browser_sync::SyncBackendHost::Status status;
       EXPECT_CALL(service, QueryDetailedSyncStatus(_))
                   .WillRepeatedly(DoAll(SetArgPointee<0>(status),
                                   Return(false)));
       provider->SetAuthError(
-          kTestUser,
+          signin->GetAuthenticatedAccountId(),
           kTestUser,
           GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
       EXPECT_CALL(service, HasUnrecoverableError())
                   .WillRepeatedly(Return(false));
       return;
     }
     case STATUS_CASE_PROTOCOL_ERROR: {
       EXPECT_CALL(service, HasSyncSetupCompleted())
                   .WillRepeatedly(Return(true));
       EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
@@ skipping 66 matching lines @@
 // will return a unique combination of status and link messages from
 // GetStatusLabels().
 TEST_F(SyncUIUtilTest, DistinctCasesReportUniqueMessageSets) {
   std::set<base::string16> messages;
   for (int idx = 0; idx != NUMBER_OF_STATUS_CASES; idx++) {
     scoped_ptr<Profile> profile(new TestingProfile());
     ProfileSyncServiceMock service(profile.get());
     GoogleServiceAuthError error = GoogleServiceAuthError::AuthErrorNone();
     EXPECT_CALL(service, GetAuthError()).WillRepeatedly(ReturnRef(error));
     FakeSigninManagerForSyncUIUtilTest signin(profile.get());
-    signin.SetAuthenticatedUsername(kTestUser);
+    signin.SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
     scoped_ptr<FakeAuthStatusProvider> provider(new FakeAuthStatusProvider(
         SigninErrorControllerFactory::GetForProfile(profile.get())));
     GetDistinctCase(service, &signin, provider.get(), idx);
     base::string16 status_label;
     base::string16 link_label;
     sync_ui_util::GetStatusLabels(&service,
                                   signin,
                                   sync_ui_util::WITH_HTML,
                                   &status_label,
                                   &link_label);
@@ skipping 18 matching lines @@
 // This test ensures that the html_links parameter on GetStatusLabels() is
 // honored.
 TEST_F(SyncUIUtilTest, HtmlNotIncludedInStatusIfNotRequested) {
   for (int idx = 0; idx != NUMBER_OF_STATUS_CASES; idx++) {
     scoped_ptr<Profile> profile(
         ProfileSyncServiceMock::MakeSignedInTestingProfile());
     ProfileSyncServiceMock service(profile.get());
     GoogleServiceAuthError error = GoogleServiceAuthError::AuthErrorNone();
     EXPECT_CALL(service, GetAuthError()).WillRepeatedly(ReturnRef(error));
     FakeSigninManagerForSyncUIUtilTest signin(profile.get());
-    signin.SetAuthenticatedUsername(kTestUser);
+    signin.SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
     scoped_ptr<FakeAuthStatusProvider> provider(new FakeAuthStatusProvider(
         SigninErrorControllerFactory::GetForProfile(profile.get())));
     GetDistinctCase(service, &signin, provider.get(), idx);
     base::string16 status_label;
     base::string16 link_label;
     sync_ui_util::GetStatusLabels(&service,
                                   signin,
                                   sync_ui_util::PLAIN_TEXT,
                                   &status_label,
                                   &link_label);
 
     // Ensures a search for string 'href' (found in links, not a string to be
     // found in an English language message) fails when links are excluded from
     // the status label.
     EXPECT_FALSE(status_label.empty());
     EXPECT_EQ(status_label.find(base::ASCIIToUTF16("href")),
               base::string16::npos);
     testing::Mock::VerifyAndClearExpectations(&service);
     testing::Mock::VerifyAndClearExpectations(&signin);
     EXPECT_CALL(service, GetAuthError()).WillRepeatedly(ReturnRef(error));
     provider.reset();
     signin.Shutdown();
   }
 }