| Index: chrome/browser/sync/sync_ui_util_unittest.cc
|
| diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc
|
| index f84856a87305f6ddeb1960f2caad3a88446099de..157abc67157f5d41c65c6784d635b47c8eab1cf1 100644
|
| --- a/chrome/browser/sync/sync_ui_util_unittest.cc
|
| +++ b/chrome/browser/sync/sync_ui_util_unittest.cc
|
| @@ -44,6 +44,7 @@ enum DistinctState {
|
|
|
| namespace {
|
|
|
| +const char kTestGaiaId[] = "gaia-id-test_user@test.com";
|
| const char kTestUser[] = "test_user@test.com";
|
|
|
| #if !defined(OS_CHROMEOS)
|
| @@ -252,7 +253,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
|
| .WillRepeatedly(DoAll(SetArgPointee<0>(status),
|
| Return(false)));
|
| provider->SetAuthError(
|
| - kTestUser,
|
| + signin->GetAuthenticatedAccountId(),
|
| kTestUser,
|
| GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
|
| EXPECT_CALL(service, HasUnrecoverableError())
|
| @@ -339,7 +340,7 @@ TEST_F(SyncUIUtilTest, DistinctCasesReportUniqueMessageSets) {
|
| 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);
|
| @@ -378,7 +379,7 @@ TEST_F(SyncUIUtilTest, HtmlNotIncludedInStatusIfNotRequested) {
|
| 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);
|
|
|