chrome/browser/sync_file_system/sync_file_system_service_factory.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_file_system/sync_file_system_service_factory.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: Fixing a unit test, addressing comments from courage@ 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

« chrome/browser/sync/profile_sync_service_unittest.cc ('K') | « chrome/browser/sync_file_system/drive_backend/api_util.cc ('k') | chrome/browser/ui/auto_login_prompter.cc » ('j') | google_apis/gaia/oauth2_token_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/sync_file_system_service_factory.cc

diff --git a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc

index a2a3addd86b60cef53430a90c85ea198acf89cf8..99ac0ac3b3dbbead14d72a85c22cfd881ee7351b 100644

--- a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc

+++ b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc

@@ -83,9 +83,12 @@ SyncFileSystemServiceFactory::BuildServiceInstanceFor(

scoped_refptr<base::SequencedWorkerPool> worker_pool(

content::BrowserThread::GetBlockingPool());

+ ProfileOAuth2TokenService* token_service =

+ ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

scoped_ptr<drive::DriveAPIService> drive_api_service(

new drive::DriveAPIService(

- ProfileOAuth2TokenServiceFactory::GetForProfile(profile),

+ token_service,

+ token_service->GetPrimaryAccountId(),

context->GetRequestContext(),

worker_pool.get(),

base_drive_url, base_download_url, wapi_base_url,