chrome/browser/sync/profile_sync_service_session_unittest.cc - Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes

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/profile_sync_service_session_unittest.cc

Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing to include the update to ProfileSyncService: r224220 Created 7 years, 3 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_preference_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_session_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc

index 5c8b558766fb6b39789e0b4e6751e3bfd6efc7c0..979ed40474ea8f0890f615838fc77e84e1eb4a97 100644

--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc

+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc

@@ -83,7 +83,7 @@ class FakeProfileSyncService : public TestProfileSyncService {

ProfileSyncComponentsFactory* factory,

Profile* profile,

SigninManagerBase* signin,

- OAuth2TokenService* oauth2_token_service,

+ ProfileOAuth2TokenService* oauth2_token_service,

ProfileSyncService::StartBehavior behavior,

bool synchronous_backend_initialization)

: TestProfileSyncService(factory,

@@ -275,7 +275,7 @@ class ProfileSyncServiceSessionTest

SigninManagerBase* signin =

SigninManagerFactory::GetForProfile(profile());

signin->SetAuthenticatedUsername("test_user");

- OAuth2TokenService* oauth2_token_service =

+ ProfileOAuth2TokenService* oauth2_token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile());

ProfileSyncComponentsFactoryMock* factory =

new ProfileSyncComponentsFactoryMock();

@@ -306,10 +306,10 @@ class ProfileSyncServiceSessionTest

EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _, _, _, _)).

WillOnce(ReturnNewDataTypeManager());

- TokenServiceFactory::GetForProfile(profile())->IssueAuthTokenForTest(

- GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");

- TokenServiceFactory::GetForProfile(profile())->IssueAuthTokenForTest(

- GaiaConstants::kSyncService, "token");

+ ProfileOAuth2TokenServiceFactory::GetForProfile(profile())

+ ->UpdateCredentials("test_user", "oauth2_login_token");

+ TokenServiceFactory::GetForProfile(profile())

+ ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");

sync_service_->Initialize();

base::MessageLoop::current()->Run();

return true;