Commit bf4b1828 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/ui/autofill

The ChromeBrowserState has been moved from the "ios" namespace
to the global namespace by http://crrev.com/c/2014913. Fix the
uses from ios::ChromeBrowserState to ChromeBrowserState.

Also remove includes of chrome_browser_state_forward.h and use
a simple forward declaration instead (since the old name is no
longer necessary).

This CL was uploaded by git cl split.

R=olivierrobin@chromium.org

Bug: 1042208
Change-Id: I7488cb81c2e655dec6aaf630009030cb82bc3bbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017507Reviewed-by: default avatarOlivier Robin <olivierrobin@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735365}
parent 49838d1f
...@@ -348,7 +348,7 @@ class SaveCardInfobarEGTestHelper ...@@ -348,7 +348,7 @@ class SaveCardInfobarEGTestHelper
} }
+ (void)clearProfilesStore { + (void)clearProfilesStore {
ios::ChromeBrowserState* browserState = ChromeBrowserState* browserState =
chrome_test_util::GetOriginalBrowserState(); chrome_test_util::GetOriginalBrowserState();
autofill::PersonalDataManager* personalDataManager = autofill::PersonalDataManager* personalDataManager =
autofill::PersonalDataManagerFactory::GetForBrowserState(browserState); autofill::PersonalDataManagerFactory::GetForBrowserState(browserState);
...@@ -461,7 +461,7 @@ class SaveCardInfobarEGTestHelper ...@@ -461,7 +461,7 @@ class SaveCardInfobarEGTestHelper
// The PersonalDataManager instance for the current browser state. // The PersonalDataManager instance for the current browser state.
+ (autofill::PersonalDataManager*)personalDataManager { + (autofill::PersonalDataManager*)personalDataManager {
ios::ChromeBrowserState* browserState = ChromeBrowserState* browserState =
chrome_test_util::GetOriginalBrowserState(); chrome_test_util::GetOriginalBrowserState();
autofill::PersonalDataManager* personalDataManager = autofill::PersonalDataManager* personalDataManager =
autofill::PersonalDataManagerFactory::GetForBrowserState(browserState); autofill::PersonalDataManagerFactory::GetForBrowserState(browserState);
......
...@@ -39,7 +39,7 @@ namespace autofill { ...@@ -39,7 +39,7 @@ namespace autofill {
// Chrome iOS implementation of AutofillClient. // Chrome iOS implementation of AutofillClient.
class ChromeAutofillClientIOS : public AutofillClient { class ChromeAutofillClientIOS : public AutofillClient {
public: public:
ChromeAutofillClientIOS(ios::ChromeBrowserState* browser_state, ChromeAutofillClientIOS(ChromeBrowserState* browser_state,
web::WebState* web_state, web::WebState* web_state,
infobars::InfoBarManager* infobar_manager, infobars::InfoBarManager* infobar_manager,
id<AutofillClientIOSBridge> bridge, id<AutofillClientIOSBridge> bridge,
...@@ -138,7 +138,7 @@ class ChromeAutofillClientIOS : public AutofillClient { ...@@ -138,7 +138,7 @@ class ChromeAutofillClientIOS : public AutofillClient {
syncer::SyncService* sync_service_; syncer::SyncService* sync_service_;
PersonalDataManager* personal_data_manager_; PersonalDataManager* personal_data_manager_;
AutocompleteHistoryManager* autocomplete_history_manager_; AutocompleteHistoryManager* autocomplete_history_manager_;
ios::ChromeBrowserState* browser_state_; ChromeBrowserState* browser_state_;
web::WebState* web_state_; web::WebState* web_state_;
__weak id<AutofillClientIOSBridge> bridge_; __weak id<AutofillClientIOSBridge> bridge_;
signin::IdentityManager* identity_manager_; signin::IdentityManager* identity_manager_;
......
...@@ -83,7 +83,7 @@ autofill::CardUnmaskPromptView* CreateCardUnmaskPromptViewBridge( ...@@ -83,7 +83,7 @@ autofill::CardUnmaskPromptView* CreateCardUnmaskPromptViewBridge(
namespace autofill { namespace autofill {
ChromeAutofillClientIOS::ChromeAutofillClientIOS( ChromeAutofillClientIOS::ChromeAutofillClientIOS(
ios::ChromeBrowserState* browser_state, ChromeBrowserState* browser_state,
web::WebState* web_state, web::WebState* web_state,
infobars::InfoBarManager* infobar_manager, infobars::InfoBarManager* infobar_manager,
id<AutofillClientIOSBridge> bridge, id<AutofillClientIOSBridge> bridge,
......
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