diff options
| author | rogerta <rogerta@chromium.org> | 2015-04-16 21:16:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 04:16:59 +0000 |
| commit | a1e15d29e401465bacd0681f256af567e7b8242f (patch) | |
| tree | 5225a6498d80fa5bdaf6639cd51f9fe1ac3eef32 /chrome/browser/sync/sync_ui_util_unittest.cc | |
| parent | 950576043d18caee3fc8bb28dfc432c3d6adcbda (diff) | |
| download | chromium_src-a1e15d29e401465bacd0681f256af567e7b8242f.zip chromium_src-a1e15d29e401465bacd0681f256af567e7b8242f.tar.gz chromium_src-a1e15d29e401465bacd0681f256af567e7b8242f.tar.bz2 | |
Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.
Depends on https://codereview.chromium.org/964553002/
BUG=341408
Review URL: https://codereview.chromium.org/964563002
Cr-Commit-Position: refs/heads/master@{#325594}
Diffstat (limited to 'chrome/browser/sync/sync_ui_util_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/sync_ui_util_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc index f84856a..157abc6 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); |