ios/chrome/browser/history/web_history_service_factory.cc - Issue 1257663002: iOS factories for SigninManager and GaiaCookieManagerService

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 1257663002: iOS factories for SigninManager and GaiaCookieManagerService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fakeSigninManager

Patch Set: Fix copyright 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/fake_signin_manager_builder.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 291045a03e5b63c6d62c1a79e35a5c0eff95e332..f30b1c47ef99f11bd0f036d685ea2463ff558b6b 100644

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

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

@@ -12,6 +12,7 @@

#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/chrome/browser/signin/signin_manager_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"

@@ -55,7 +56,7 @@ WebHistoryServiceFactory::WebHistoryServiceFactory()

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

DependsOn(provider->GetSyncServiceFactory());

DependsOn(OAuth2TokenServiceFactory::GetInstance());

- DependsOn(provider->GetSigninManagerFactory());

+ DependsOn(ios::SigninManagerFactory::GetInstance());

}

WebHistoryServiceFactory::~WebHistoryServiceFactory() {

@@ -65,10 +66,9 @@ scoped_ptr<KeyedService> WebHistoryServiceFactory::BuildServiceInstanceFor(

web::BrowserState* context) const {

ios::ChromeBrowserState* browser_state =

ios::ChromeBrowserState::FromBrowserState(context);

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

return make_scoped_ptr(new history::WebHistoryService(

OAuth2TokenServiceFactory::GetForBrowserState(browser_state),

- provider->GetSigninManagerForBrowserState(browser_state),

+ ios::SigninManagerFactory::GetForBrowserState(browser_state),

browser_state->GetRequestContext()));

}