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

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=eugenebut@chromium.org

Bug: 1042208
Change-Id: Ic8e0433afeeabe0b65e8aed99c40b3a8ff513abe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017426Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735294}

ios/chrome/browser/ui/webui/about_ui.cc

@@ -153,7 +153,7 @@ bool AboutUIHTMLSource::ShouldDenyXFrameOptions() const {
 
 AboutUI::AboutUI(web::WebUIIOS* web_ui, const std::string& name)
     : web::WebUIIOSController(web_ui) {
-  web::URLDataSourceIOS::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::URLDataSourceIOS::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                              new AboutUIHTMLSource(name));
 }
 

ios/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui_ios.mm

@@ -19,8 +19,7 @@ using autofill::LogRouter;
 
 AutofillInternalsUIIOS::AutofillInternalsUIIOS(web::WebUIIOS* web_ui)
     : web::WebUIIOSController(web_ui) {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui);
+  ChromeBrowserState* browser_state = ChromeBrowserState::FromWebUIIOS(web_ui);
   web::WebUIIOSDataSource::Add(
       browser_state,
       autofill::CreateInternalsHTMLSource(kChromeUIAutofillInternalsHost));

ios/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h

@@ -33,7 +33,7 @@ class InternalsUIHandler : public web::WebUIIOSMessageHandler,
                            public autofill::LogReceiver {
  public:
   using GetLogRouterFunction =
-      base::RepeatingCallback<LogRouter*(ios::ChromeBrowserState*)>;
+      base::RepeatingCallback<LogRouter*(ChromeBrowserState*)>;
 
   explicit InternalsUIHandler(std::string call_on_load,
                               GetLogRouterFunction get_log_router_function);

ios/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.mm

@@ -69,8 +69,8 @@ void InternalsUIHandler::RegisterMessages() {
 void InternalsUIHandler::OnLoaded(const base::ListValue* args) {
   web_ui()->CallJavascriptFunction(call_on_load_, {});
 
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui());
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromWebUIIOS(web_ui());
   base::Value is_incognito(browser_state->IsOffTheRecord());
   web_ui()->CallJavascriptFunction("notifyAboutIncognito", {&is_incognito});
   web_ui()->CallJavascriptFunction("notifyAboutVariations",
@@ -79,8 +79,8 @@ void InternalsUIHandler::OnLoaded(const base::ListValue* args) {
 }
 
 void InternalsUIHandler::StartSubscription() {
-  LogRouter* log_router = get_log_router_function_.Run(
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui()));
+  LogRouter* log_router =
+      get_log_router_function_.Run(ChromeBrowserState::FromWebUIIOS(web_ui()));
   if (!log_router)
     return;
 
@@ -95,8 +95,8 @@ void InternalsUIHandler::EndSubscription() {
   if (!registered_with_log_router_)
     return;
   registered_with_log_router_ = false;
-  LogRouter* log_router = get_log_router_function_.Run(
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui()));
+  LogRouter* log_router =
+      get_log_router_function_.Run(ChromeBrowserState::FromWebUIIOS(web_ui()));
   if (log_router)
     log_router->UnregisterReceiver(this);
 }

ios/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui_ios.mm

@@ -20,8 +20,7 @@ using autofill::LogRouter;
 PasswordManagerInternalsUIIOS::PasswordManagerInternalsUIIOS(
     web::WebUIIOS* web_ui)
     : web::WebUIIOSController(web_ui) {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui);
+  ChromeBrowserState* browser_state = ChromeBrowserState::FromWebUIIOS(web_ui);
   web::WebUIIOSDataSource::Add(browser_state,
                                autofill::CreateInternalsHTMLSource(
                                    kChromeUIPasswordManagerInternalsHost));

ios/chrome/browser/ui/webui/crashes_ui.cc

@@ -156,6 +156,6 @@ CrashesUI::CrashesUI(web::WebUIIOS* web_ui) : web::WebUIIOSController(web_ui) {
   web_ui->AddMessageHandler(std::make_unique<CrashesDOMHandler>());
 
   // Set up the chrome://crashes/ source.
-  web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::WebUIIOSDataSource::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                                CreateCrashesUIHTMLSource());
 }

ios/chrome/browser/ui/webui/flags_ui.cc

@@ -201,7 +201,7 @@ FlagsUI::FlagsUI(web::WebUIIOS* web_ui)
                 flag_access);
 
   // Set up the about:flags source.
-  web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::WebUIIOSDataSource::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                                CreateFlagsUIHTMLSource());
 }
 

ios/chrome/browser/ui/webui/inspect/inspect_ui.mm

@@ -88,10 +88,10 @@ class InspectDOMHandler : public web::WebUIIOSMessageHandler,
   // TabModelListObserver
   void TabModelRegisteredWithBrowserState(
       TabModel* tab_model,
-      ios::ChromeBrowserState* browser_state) override;
+      ChromeBrowserState* browser_state) override;
   void TabModelUnregisteredFromBrowserState(
       TabModel* tab_model,
-      ios::ChromeBrowserState* browser_state) override;
+      ChromeBrowserState* browser_state) override;
 
   // WebStateListObserver
   void WebStateInsertedAt(WebStateList* web_state_list,
@@ -152,8 +152,8 @@ void InspectDOMHandler::SetLoggingEnabled(bool enabled) {
   logging_enabled_ = enabled;
 
   web::BrowserState* browser_state = web_ui()->GetWebState()->GetBrowserState();
-  ios::ChromeBrowserState* chrome_browser_state =
-      ios::ChromeBrowserState::FromBrowserState(browser_state);
+  ChromeBrowserState* chrome_browser_state =
+      ChromeBrowserState::FromBrowserState(browser_state);
   NSArray<TabModel*>* tab_models =
       TabModelList::GetTabModelsForChromeBrowserState(chrome_browser_state);
 
@@ -219,14 +219,14 @@ void InspectDOMHandler::SetDelegateForWebStatesInTabModel(
 // TabModelListObserver
 void InspectDOMHandler::TabModelRegisteredWithBrowserState(
     TabModel* tab_model,
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   tab_model.webStateList->AddObserver(this);
   SetDelegateForWebStatesInTabModel(tab_model, this);
 }
 
 void InspectDOMHandler::TabModelUnregisteredFromBrowserState(
     TabModel* tab_model,
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   tab_model.webStateList->RemoveObserver(this);
   SetDelegateForWebStatesInTabModel(tab_model, nullptr);
 }
@@ -260,7 +260,7 @@ InspectUI::InspectUI(web::WebUIIOS* web_ui) : web::WebUIIOSController(web_ui) {
 
   web_ui->AddMessageHandler(std::make_unique<InspectDOMHandler>());
 
-  web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::WebUIIOSDataSource::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                                CreateInspectUIHTMLSource());
 }
 

ios/chrome/browser/ui/webui/omaha_ui.cc

@@ -87,8 +87,7 @@ OmahaUI::OmahaUI(web::WebUIIOS* web_ui) : WebUIIOSController(web_ui) {
   web_ui->AddMessageHandler(std::make_unique<OmahaDOMHandler>());
 
   // Set up the chrome://omaha/ source.
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui);
+  ChromeBrowserState* browser_state = ChromeBrowserState::FromWebUIIOS(web_ui);
   web::WebUIIOSDataSource::Add(browser_state, CreateOmahaUIHTMLSource());
 }
 

ios/chrome/browser/ui/webui/prefs_internals_ui.cc

@@ -22,7 +22,7 @@ namespace {
 // state.
 class PrefsInternalsSource : public web::URLDataSourceIOS {
  public:
-  explicit PrefsInternalsSource(ios::ChromeBrowserState* browser_state)
+  explicit PrefsInternalsSource(ChromeBrowserState* browser_state)
       : browser_state_(browser_state) {}
   ~PrefsInternalsSource() override = default;
 
@@ -55,7 +55,7 @@ class PrefsInternalsSource : public web::URLDataSourceIOS {
   }
 
  private:
-  ios::ChromeBrowserState* browser_state_;
+  ChromeBrowserState* browser_state_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefsInternalsSource);
 };
@@ -64,8 +64,7 @@ class PrefsInternalsSource : public web::URLDataSourceIOS {
 
 PrefsInternalsUI::PrefsInternalsUI(web::WebUIIOS* web_ui)
     : web::WebUIIOSController(web_ui) {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui);
+  ChromeBrowserState* browser_state = ChromeBrowserState::FromWebUIIOS(web_ui);
   web::URLDataSourceIOS::Add(browser_state,
                              new PrefsInternalsSource(browser_state));
 }

ios/chrome/browser/ui/webui/signin_internals_ui_ios.cc

@@ -35,8 +35,7 @@ web::WebUIIOSDataSource* CreateSignInInternalsHTMLSource() {
 
 SignInInternalsUIIOS::SignInInternalsUIIOS(web::WebUIIOS* web_ui)
     : WebUIIOSController(web_ui) {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui);
+  ChromeBrowserState* browser_state = ChromeBrowserState::FromWebUIIOS(web_ui);
   DCHECK(browser_state);
   web::WebUIIOSDataSource::Add(browser_state,
                                CreateSignInInternalsHTMLSource());
@@ -48,8 +47,8 @@ SignInInternalsUIIOS::SignInInternalsUIIOS(web::WebUIIOS* web_ui)
 }
 
 SignInInternalsUIIOS::~SignInInternalsUIIOS() {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui());
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromWebUIIOS(web_ui());
   DCHECK(browser_state);
   AboutSigninInternals* about_signin_internals =
       ios::AboutSigninInternalsFactory::GetForBrowserState(browser_state);
@@ -62,8 +61,8 @@ bool SignInInternalsUIIOS::OverrideHandleWebUIIOSMessage(
     const std::string& name,
     const base::ListValue& content) {
   if (name == "getSigninInfo") {
-    ios::ChromeBrowserState* browser_state =
-        ios::ChromeBrowserState::FromWebUIIOS(web_ui());
+    ChromeBrowserState* browser_state =
+        ChromeBrowserState::FromWebUIIOS(web_ui());
     DCHECK(browser_state);
 
     AboutSigninInternals* about_signin_internals =

ios/chrome/browser/ui/webui/suggestions_ui.cc

@@ -62,8 +62,7 @@ std::string SuggestionsSourceWrapper::GetMimeType(
 
 SuggestionsUI::SuggestionsUI(web::WebUIIOS* web_ui)
     : web::WebUIIOSController(web_ui) {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromWebUIIOS(web_ui);
+  ChromeBrowserState* browser_state = ChromeBrowserState::FromWebUIIOS(web_ui);
   web::URLDataSourceIOS::Add(
       browser_state,
       new SuggestionsSourceWrapper(

ios/chrome/browser/ui/webui/terms_ui.mm

@@ -91,7 +91,7 @@ bool TermsUIHTMLSource::ShouldDenyXFrameOptions() const {
 
 TermsUI::TermsUI(web::WebUIIOS* web_ui, const std::string& name)
     : web::WebUIIOSController(web_ui) {
-  web::URLDataSourceIOS::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::URLDataSourceIOS::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                              new TermsUIHTMLSource(name));
 }
 

ios/chrome/browser/ui/webui/translate_internals/ios_translate_internals_handler.mm

@@ -52,8 +52,8 @@ void IOSTranslateInternalsHandler::CallJavascriptFunction(
 
 void IOSTranslateInternalsHandler::RegisterMessages() {
   web::BrowserState* browser_state = web_ui()->GetWebState()->GetBrowserState();
-  ios::ChromeBrowserState* chrome_browser_state =
-      ios::ChromeBrowserState::FromBrowserState(browser_state)
+  ChromeBrowserState* chrome_browser_state =
+      ChromeBrowserState::FromBrowserState(browser_state)
           ->GetOriginalChromeBrowserState();
   NSArray<TabModel*>* tab_models =
       TabModelList::GetTabModelsForChromeBrowserState(chrome_browser_state);

ios/chrome/browser/ui/webui/translate_internals/translate_internals_ui.mm

@@ -51,7 +51,7 @@ web::WebUIIOSDataSource* CreateTranslateInternalsHTMLSource() {
 TranslateInternalsUI::TranslateInternalsUI(web::WebUIIOS* web_ui)
     : web::WebUIIOSController(web_ui) {
   web_ui->AddMessageHandler(std::make_unique<IOSTranslateInternalsHandler>());
-  web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::WebUIIOSDataSource::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                                CreateTranslateInternalsHTMLSource());
 }
 

ios/chrome/browser/ui/webui/ukm_internals_ui.cc

@@ -81,7 +81,7 @@ UkmInternalsUI::UkmInternalsUI(web::WebUIIOS* web_ui)
   web_ui->AddMessageHandler(std::make_unique<UkmMessageHandler>(ukm_service));
 
   // Set up the chrome://ukm/ source.
-  web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::WebUIIOSDataSource::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                                CreateUkmInternalsUIHTMLSource());
 }
 

ios/chrome/browser/ui/webui/user_actions_ui.mm

@@ -25,7 +25,7 @@ UserActionsUI::UserActionsUI(web::WebUIIOS* web_ui)
   html_source->SetDefaultResource(IDR_USER_ACTIONS_HTML);
   html_source->AddResourcePath("user_actions.css", IDR_USER_ACTIONS_CSS);
   html_source->AddResourcePath("user_actions.js", IDR_USER_ACTIONS_JS);
-  web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::WebUIIOSDataSource::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                                html_source);
 }
 

ios/chrome/browser/ui/webui/version_ui.mm

@@ -114,7 +114,7 @@ web::WebUIIOSDataSource* CreateVersionUIDataSource() {
 
 VersionUI::VersionUI(web::WebUIIOS* web_ui) : web::WebUIIOSController(web_ui) {
   web_ui->AddMessageHandler(std::make_unique<VersionHandler>());
-  web::WebUIIOSDataSource::Add(ios::ChromeBrowserState::FromWebUIIOS(web_ui),
+  web::WebUIIOSDataSource::Add(ChromeBrowserState::FromWebUIIOS(web_ui),
                                CreateVersionUIDataSource());
 }