chrome/browser/sync/sync_ui_util_unittest.cc - Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/sync_ui_util_unittest.cc

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv

Patch Set: rebased Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/profile_sync_service_unittest.cc ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.cc » ('j') | chrome/browser/ui/webui/options/options_ui_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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) {