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

Unified Diff: ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_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/browser_state/browser_state_keyed_service_factories.mm ('k') | ios/chrome/browser/history/web_history_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc

diff --git a/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc b/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc

index 5e540182dfdf68e73b4267d27897fb34b16a78c4..0d761e9e6a3cacd5565852ec20a40d3aa72291e7 100644

--- a/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc

+++ b/ios/chrome/browser/enhanced_bookmarks/bookmark_server_cluster_service_factory.cc

@@ -8,12 +8,13 @@

#include "base/memory/singleton.h"

#include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"

#include "components/keyed_service/ios/browser_state_dependency_manager.h"

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

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

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

#include "ios/chrome/browser/application_context.h"

#include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"

#include "ios/chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.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/chrome_browser_provider.h"

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

@@ -40,7 +41,7 @@ BookmarkServerClusterServiceFactory::BookmarkServerClusterServiceFactory()

BrowserStateDependencyManager::GetInstance()) {

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

DependsOn(OAuth2TokenServiceFactory::GetInstance());

- DependsOn(provider->GetSigninManagerFactory());

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

DependsOn(EnhancedBookmarkModelFactory::GetInstance());

DependsOn(provider->GetSyncServiceFactory());

}

@@ -59,7 +60,7 @@ BookmarkServerClusterServiceFactory::BuildServiceInstanceFor(

GetApplicationContext()->GetApplicationLocale(),

browser_state->GetRequestContext(),

OAuth2TokenServiceFactory::GetForBrowserState(browser_state),

- provider->GetSigninManagerForBrowserState(browser_state),

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

EnhancedBookmarkModelFactory::GetForBrowserState(browser_state),

provider->GetSyncServiceForBrowserState(browser_state),

browser_state->GetPrefs()));