Commit 4a10051a authored by Colin Blundell's avatar Colin Blundell Committed by Commit Bot

Use IdentityManagerFactory::GetFor*() as static methods

Followup to review comment on
https://chromium-review.googlesource.com/c/chromium/src/+/928654.

TBR=jam@chromium.org

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ib2c5b3a86929491272399df515638e813b65db25
Reviewed-on: https://chromium-review.googlesource.com/939462
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539834}
parent 4848d525
...@@ -129,8 +129,7 @@ syncer::SyncService* ChromeAutofillClient::GetSyncService() { ...@@ -129,8 +129,7 @@ syncer::SyncService* ChromeAutofillClient::GetSyncService() {
identity::IdentityManager* ChromeAutofillClient::GetIdentityManager() { identity::IdentityManager* ChromeAutofillClient::GetIdentityManager() {
Profile* profile = Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext()); Profile::FromBrowserContext(web_contents()->GetBrowserContext());
return IdentityManagerFactory::GetInstance()->GetForProfile( return IdentityManagerFactory::GetForProfile(profile->GetOriginalProfile());
profile->GetOriginalProfile());
} }
ukm::UkmRecorder* ChromeAutofillClient::GetUkmRecorder() { ukm::UkmRecorder* ChromeAutofillClient::GetUkmRecorder() {
......
...@@ -60,7 +60,7 @@ CvcUnmaskViewController::CvcUnmaskViewController( ...@@ -60,7 +60,7 @@ CvcUnmaskViewController::CvcUnmaskViewController(
->GetRequestContext(), ->GetRequestContext(),
Profile::FromBrowserContext(web_contents_->GetBrowserContext()) Profile::FromBrowserContext(web_contents_->GetBrowserContext())
->GetPrefs(), ->GetPrefs(),
IdentityManagerFactory::GetInstance()->GetForProfile( IdentityManagerFactory::GetForProfile(
Profile::FromBrowserContext(web_contents_->GetBrowserContext()) Profile::FromBrowserContext(web_contents_->GetBrowserContext())
->GetOriginalProfile()), ->GetOriginalProfile()),
/*unmask_delegate=*/this, /*unmask_delegate=*/this,
......
...@@ -49,12 +49,12 @@ PersonalDataManagerFactory::BuildServiceInstanceFor( ...@@ -49,12 +49,12 @@ PersonalDataManagerFactory::BuildServiceInstanceFor(
ios::ChromeBrowserState::FromBrowserState(context); ios::ChromeBrowserState::FromBrowserState(context);
std::unique_ptr<PersonalDataManager> service( std::unique_ptr<PersonalDataManager> service(
new PersonalDataManager(GetApplicationContext()->GetApplicationLocale())); new PersonalDataManager(GetApplicationContext()->GetApplicationLocale()));
service->Init(ios::WebDataServiceFactory::GetAutofillWebDataForBrowserState( service->Init(
chrome_browser_state, ServiceAccessType::EXPLICIT_ACCESS), ios::WebDataServiceFactory::GetAutofillWebDataForBrowserState(
chrome_browser_state->GetPrefs(), chrome_browser_state, ServiceAccessType::EXPLICIT_ACCESS),
IdentityManagerFactory::GetInstance()->GetForBrowserState( chrome_browser_state->GetPrefs(),
chrome_browser_state), IdentityManagerFactory::GetForBrowserState(chrome_browser_state),
chrome_browser_state->IsOffTheRecord()); chrome_browser_state->IsOffTheRecord());
return service; return service;
} }
......
...@@ -46,9 +46,8 @@ ChromeAutofillClientIOS::ChromeAutofillClientIOS( ...@@ -46,9 +46,8 @@ ChromeAutofillClientIOS::ChromeAutofillClientIOS(
browser_state->GetOriginalChromeBrowserState())), browser_state->GetOriginalChromeBrowserState())),
web_state_(web_state), web_state_(web_state),
bridge_(bridge), bridge_(bridge),
identity_manager_( identity_manager_(IdentityManagerFactory::GetForBrowserState(
IdentityManagerFactory::GetInstance()->GetForBrowserState( browser_state->GetOriginalChromeBrowserState())),
browser_state->GetOriginalChromeBrowserState())),
autofill_web_data_service_( autofill_web_data_service_(
ios::WebDataServiceFactory::GetAutofillWebDataForBrowserState( ios::WebDataServiceFactory::GetAutofillWebDataForBrowserState(
browser_state, browser_state,
......
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
ios_web_view::WebViewPersonalDataManagerFactory::GetForBrowserState( ios_web_view::WebViewPersonalDataManagerFactory::GetForBrowserState(
browserState->GetRecordingBrowserState()), browserState->GetRecordingBrowserState()),
_webState, self, _webState, self,
ios_web_view::WebViewIdentityManagerFactory::GetInstance() ios_web_view::WebViewIdentityManagerFactory::GetForBrowserState(
->GetForBrowserState(browserState), browserState),
ios_web_view::WebViewWebDataServiceWrapperFactory:: ios_web_view::WebViewWebDataServiceWrapperFactory::
GetAutofillWebDataForBrowserState( GetAutofillWebDataForBrowserState(
browserState, ServiceAccessType::EXPLICIT_ACCESS))); browserState, ServiceAccessType::EXPLICIT_ACCESS)));
......
...@@ -55,8 +55,7 @@ WebViewPersonalDataManagerFactory::BuildServiceInstanceFor( ...@@ -55,8 +55,7 @@ WebViewPersonalDataManagerFactory::BuildServiceInstanceFor(
WebViewWebDataServiceWrapperFactory::GetAutofillWebDataForBrowserState( WebViewWebDataServiceWrapperFactory::GetAutofillWebDataForBrowserState(
browser_state, ServiceAccessType::EXPLICIT_ACCESS), browser_state, ServiceAccessType::EXPLICIT_ACCESS),
browser_state->GetPrefs(), browser_state->GetPrefs(),
WebViewIdentityManagerFactory::GetInstance()->GetForBrowserState( WebViewIdentityManagerFactory::GetForBrowserState(browser_state),
browser_state),
browser_state->IsOffTheRecord()); browser_state->IsOffTheRecord());
return service; return service;
} }
......
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