ios/chrome/browser/history/web_history_service_factory.cc - Issue 1251463002: iOS factories for ProfileOAuth2TokenService and AccountTrackerService

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: ios/chrome/browser/history/web_history_service_factory.cc

Issue 1251463002: iOS factories for ProfileOAuth2TokenService and AccountTrackerService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@componentizeOAuth2

Patch Set: Review comments Created 5 years, 5 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 | « ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc ('k') | ios/chrome/browser/signin/account_tracker_service_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/history/web_history_service_factory.cc

diff --git a/ios/chrome/browser/history/web_history_service_factory.cc b/ios/chrome/browser/history/web_history_service_factory.cc

index 7efc452dbff0e1913b3454d1553f6412e4eb68d3..291045a03e5b63c6d62c1a79e35a5c0eff95e332 100644

--- a/ios/chrome/browser/history/web_history_service_factory.cc

+++ b/ios/chrome/browser/history/web_history_service_factory.cc

@@ -11,6 +11,7 @@

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_manager.h"

#include "components/sync_driver/sync_service.h"

+#include "ios/chrome/browser/signin/oauth2_token_service_factory.h"

#include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"

#include "ios/public/provider/chrome/browser/keyed_service_provider.h"

#include "net/url_request/url_request_context_getter.h"

@@ -53,7 +54,7 @@ WebHistoryServiceFactory::WebHistoryServiceFactory()

BrowserStateDependencyManager::GetInstance()) {

ios::KeyedServiceProvider* provider = ios::GetKeyedServiceProvider();

DependsOn(provider->GetSyncServiceFactory());

- DependsOn(provider->GetProfileOAuth2TokenServiceFactory());

+ DependsOn(OAuth2TokenServiceFactory::GetInstance());

DependsOn(provider->GetSigninManagerFactory());

}

@@ -66,7 +67,7 @@ scoped_ptr<KeyedService> WebHistoryServiceFactory::BuildServiceInstanceFor(

ios::ChromeBrowserState::FromBrowserState(context);

ios::KeyedServiceProvider* provider = ios::GetKeyedServiceProvider();

return make_scoped_ptr(new history::WebHistoryService(

- provider->GetProfileOAuth2TokenServiceForBrowserState(browser_state),

+ OAuth2TokenServiceFactory::GetForBrowserState(browser_state),

provider->GetSigninManagerForBrowserState(browser_state),

browser_state->GetRequestContext()));

}