chrome/browser/history/web_history_service.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/history/web_history_service.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 access token cache handling 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/google_apis/auth_service.cc ('k') | chrome/browser/invalidation/invalidation_service_factory.cc » ('j') | chrome/browser/signin/android_profile_oauth2_token_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/web_history_service.cc

diff --git a/chrome/browser/history/web_history_service.cc b/chrome/browser/history/web_history_service.cc

index 3def0b69ca2f3684e98038072bb04467713e2659..38167137c0e5c2f6a989b7a0e444a8f92b960a03 100644

--- a/chrome/browser/history/web_history_service.cc

+++ b/chrome/browser/history/web_history_service.cc

@@ -81,7 +81,8 @@ class RequestImpl : public WebHistoryService::Request,

ProfileOAuth2TokenService* token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);

- token_request_ = token_service->StartRequest(oauth_scopes, this);

+ token_request_ = token_service->StartRequest(

+ token_service->GetPrimaryAccountId(), oauth_scopes, this);

is_pending_ = true;

}

@@ -99,10 +100,13 @@ class RequestImpl : public WebHistoryService::Request,

if (response_code_ == net::HTTP_UNAUTHORIZED && ++auth_retry_count_ <= 1) {

OAuth2TokenService::ScopeSet oauth_scopes;

oauth_scopes.insert(kHistoryOAuthScope);

- ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)

- ->InvalidateToken(oauth_scopes, access_token_);

+ ProfileOAuth2TokenService* token_service =

+ ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);

+ token_service->InvalidateToken(token_service->GetPrimaryAccountId(),

+ oauth_scopes,

+ access_token_);

- access_token_ = std::string();

+ access_token_.clear();

Start();

return;

}