chrome/browser/invalidation/invalidation_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/invalidation/invalidation_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: Updates to AndroidPO2TS and removing the DCHECK(signin_manager) from GetPrimaryAccountId Created 7 years, 4 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/extensions/api/identity/identity_api.cc ('K') | « chrome/browser/history/web_history_service.cc ('k') | chrome/browser/invalidation/ticl_invalidation_service.h » ('j') | chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/invalidation/invalidation_service_factory.cc

diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc

index 741e6fb216b93b8049db569ec3528a55da1b0cf8..39cb90b85d3f5f65e486533b67eff1ecf1aafe91 100644

--- a/chrome/browser/invalidation/invalidation_service_factory.cc

+++ b/chrome/browser/invalidation/invalidation_service_factory.cc

@@ -16,12 +16,8 @@

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

#include "chrome/browser/signin/signin_manager.h"

#include "chrome/browser/signin/signin_manager_factory.h"

-#include "chrome/browser/signin/token_service.h"

-#include "chrome/browser/signin/token_service_factory.h"

#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"

-class TokenService;

namespace invalidation {

// static

@@ -91,13 +87,11 @@ BrowserContextKeyedService* InvalidationServiceFactory::BuildServiceInstanceFor(

#else

SigninManagerBase* signin_manager =

SigninManagerFactory::GetForProfile(profile);

- TokenService* token_service = TokenServiceFactory::GetForProfile(profile);

- OAuth2TokenService* oauth2_token_service =

+ ProfileOAuth2TokenService* oauth2_token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

TiclInvalidationService* service = new TiclInvalidationService(

signin_manager,

- token_service,

oauth2_token_service,

profile);

service->Init();