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

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

Bug: 1042208
Change-Id: Id5fa0845ad499bb3d2922b23d7e9a9d6ad3f5920
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017483Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734885}

ios/chrome/browser/unified_consent/unified_consent_service_factory.cc

@@ -31,7 +31,7 @@ UnifiedConsentServiceFactory::~UnifiedConsentServiceFactory() = default;
 // static
 unified_consent::UnifiedConsentService*
 UnifiedConsentServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<unified_consent::UnifiedConsentService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -39,7 +39,7 @@ UnifiedConsentServiceFactory::GetForBrowserState(
 // static
 unified_consent::UnifiedConsentService*
 UnifiedConsentServiceFactory::GetForBrowserStateIfExists(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<unified_consent::UnifiedConsentService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, false));
 }
@@ -53,8 +53,8 @@ UnifiedConsentServiceFactory* UnifiedConsentServiceFactory::GetInstance() {
 std::unique_ptr<KeyedService>
 UnifiedConsentServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   sync_preferences::PrefServiceSyncable* user_pref_service =
       browser_state->GetSyncablePrefs();
 

ios/chrome/browser/unified_consent/unified_consent_service_factory.h

@@ -8,7 +8,8 @@
 #include "base/macros.h"
 #include "base/no_destructor.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
+
+class ChromeBrowserState;
 
 namespace unified_consent {
 class UnifiedConsentService;
@@ -17,10 +18,10 @@ class UnifiedConsentService;
 class UnifiedConsentServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static unified_consent::UnifiedConsentService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static unified_consent::UnifiedConsentService* GetForBrowserStateIfExists(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static UnifiedConsentServiceFactory* GetInstance();