Commit 3189a329 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Remove IdentityManagerFactory::EnsureFactoryAndDependeeFactoriesBuilt

This method is unnecessary for two reasons.

1.  as IdentityManagerFactory constructor declares dependencies on
    other KeyedService's factories, this ensures they are built

2.  IdentityManagerFactory now only depends on SigninClientFactory
    that is created from EnsureBrowserStateKeyedServiceFactoriesBuilt

Bug: none
Change-Id: Icaa1b443519afbab90752d7869957458f5149d5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1696966
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarMihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676834}
parent bfd3a255
......@@ -103,7 +103,7 @@ void EnsureBrowserStateKeyedServiceFactoriesBuilt() {
ConsentAuditorFactory::GetInstance();
FullscreenControllerFactory::GetInstance();
GoogleLogoServiceFactory::GetInstance();
IdentityManagerFactory::EnsureFactoryAndDependeeFactoriesBuilt();
IdentityManagerFactory::GetInstance();
IOSChromeContentSuggestionsServiceFactory::GetInstance();
IOSChromeDeprecatedProfileInvalidationProviderFactory::GetInstance();
IOSChromeFaviconLoaderFactory::GetInstance();
......
......@@ -114,12 +114,6 @@ IdentityManagerFactory* IdentityManagerFactory::GetInstance() {
return instance.get();
}
// static
void IdentityManagerFactory::EnsureFactoryAndDependeeFactoriesBuilt() {
IdentityManagerFactory::GetInstance();
SigninClientFactory::GetInstance();
}
void IdentityManagerFactory::AddObserver(
IdentityManagerFactoryObserver* observer) {
observer_list_.AddObserver(observer);
......
......@@ -32,10 +32,6 @@ class IdentityManagerFactory : public BrowserStateKeyedServiceFactory {
// Returns an instance of the IdentityManagerFactory singleton.
static IdentityManagerFactory* GetInstance();
// Ensures that IdentityManagerFactory and the factories on which it depends
// are built.
static void EnsureFactoryAndDependeeFactoriesBuilt();
// Methods to register or remove observers of IdentityManager
// creation/shutdown.
void AddObserver(IdentityManagerFactoryObserver* observer);
......
......@@ -27,10 +27,6 @@ class WebViewIdentityManagerFactory : public BrowserStateKeyedServiceFactory {
// Returns an instance of the WebViewIdentityManagerFactory singleton.
static WebViewIdentityManagerFactory* GetInstance();
// Ensures that IdentityManagerFactory and the factories on which it depends
// are built.
static void EnsureFactoryAndDependeeFactoriesBuilt();
private:
friend class base::NoDestructor<WebViewIdentityManagerFactory>;
......
......@@ -124,12 +124,6 @@ WebViewIdentityManagerFactory* WebViewIdentityManagerFactory::GetInstance() {
return instance.get();
}
// static
void WebViewIdentityManagerFactory::EnsureFactoryAndDependeeFactoriesBuilt() {
WebViewIdentityManagerFactory::GetInstance();
WebViewSigninClientFactory::GetInstance();
}
std::unique_ptr<KeyedService>
WebViewIdentityManagerFactory::BuildServiceInstanceFor(
web::BrowserState* context) const {
......
......@@ -201,7 +201,7 @@ void WebViewBrowserState::RegisterPrefs(
WebViewHostContentSettingsMapFactory::GetInstance();
WebViewSigninClientFactory::GetInstance();
WebViewSigninErrorControllerFactory::GetInstance();
WebViewIdentityManagerFactory::EnsureFactoryAndDependeeFactoriesBuilt();
WebViewIdentityManagerFactory::GetInstance();
WebViewGCMProfileServiceFactory::GetInstance();
WebViewProfileInvalidationProviderFactory::GetInstance();
WebViewProfileSyncServiceFactory::GetInstance();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment