[ios] Fix uses of ios::ChromeBrowserState in /ios/public/provider

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

Bug: 1042208
Change-Id: I36033d5ab5538a9d9e3ec30235c2dcd7857bda3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017202
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735269}

ios/public/provider/chrome/browser/chrome_browser_provider.h

@@ -15,11 +15,11 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 
 class AppDistributionProvider;
 class BrandedImageProvider;
 class BrowserURLRewriterProvider;
+class ChromeBrowserState;
 class FullscreenProvider;
 class MailtoHandlerProvider;
 class OmahaServiceProvider;
@@ -126,7 +126,7 @@ class ChromeBrowserProvider {
 
   // Schedule any embedder-specific startup tasks.
   virtual void ScheduleDeferredStartupTasks(
-      ios::ChromeBrowserState* browser_state) const;
+      ChromeBrowserState* browser_state) const;
 
   // Returns an instance of the voice search provider, if one exists.
   virtual VoiceSearchProvider* GetVoiceSearchProvider() const;
@@ -134,9 +134,9 @@ class ChromeBrowserProvider {
   // Returns an instance of the app distribution provider.
   virtual AppDistributionProvider* GetAppDistributionProvider() const;
 
-  virtual id<LogoVendor> CreateLogoVendor(
-      ios::ChromeBrowserState* browser_state,
-      web::WebState* web_state) const NS_RETURNS_RETAINED;
+  virtual id<LogoVendor> CreateLogoVendor(ChromeBrowserState* browser_state,
+                                          web::WebState* web_state) const
+      NS_RETURNS_RETAINED;
 
   // Returns an instance of the omaha service provider.
   virtual OmahaServiceProvider* GetOmahaServiceProvider() const;

ios/public/provider/chrome/browser/chrome_browser_provider.mm

@@ -87,7 +87,7 @@ void ChromeBrowserProvider::AttachTabHelpers(web::WebState* web_state) const {}
 void ChromeBrowserProvider::AttachBrowserAgents(Browser* browser) const {}
 
 void ChromeBrowserProvider::ScheduleDeferredStartupTasks(
-    ios::ChromeBrowserState* browser_state) const {}
+    ChromeBrowserState* browser_state) const {}
 
 VoiceSearchProvider* ChromeBrowserProvider::GetVoiceSearchProvider() const {
   return nullptr;
@@ -99,7 +99,7 @@ AppDistributionProvider* ChromeBrowserProvider::GetAppDistributionProvider()
 }
 
 id<LogoVendor> ChromeBrowserProvider::CreateLogoVendor(
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     web::WebState* web_state) const {
   return nil;
 }

ios/public/provider/chrome/browser/mailto/mailto_handler_provider.h

@@ -8,8 +8,8 @@
 #import <UIKit/UIKit.h>
 
 #include "base/macros.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 
+class ChromeBrowserState;
 @class ChromeIdentity;
 
 typedef ChromeIdentity* (^SignedInIdentityBlock)(void);
@@ -22,7 +22,7 @@ class MailtoHandlerProvider {
   virtual ~MailtoHandlerProvider();
 
   // Sets up mailto handling for |browser_state|.
-  virtual void PrepareMailtoHandling(ios::ChromeBrowserState* browser_state);
+  virtual void PrepareMailtoHandling(ChromeBrowserState* browser_state);
 
   // Unregisters the mailto handler for browser state.
   virtual void RemoveMailtoHandling();

ios/public/provider/chrome/browser/mailto/mailto_handler_provider.mm

@@ -13,7 +13,7 @@ MailtoHandlerProvider::MailtoHandlerProvider() {}
 MailtoHandlerProvider::~MailtoHandlerProvider() {}
 
 void MailtoHandlerProvider::PrepareMailtoHandling(
-    ios::ChromeBrowserState* browser_state) {}
+    ChromeBrowserState* browser_state) {}
 
 void MailtoHandlerProvider::RemoveMailtoHandling() {}
 

ios/public/provider/chrome/browser/voice/voice_search_provider.h

@@ -10,10 +10,10 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 
 @protocol ApplicationCommands;
 class AudioSessionController;
+class ChromeBrowserState;
 class VoiceSearchController;
 
 // VoiceSearchProvider allows embedders to provide functionality related to
@@ -35,7 +35,7 @@ class VoiceSearchProvider {
 
   // Creates a new VoiceSearchController object.
   virtual scoped_refptr<VoiceSearchController> CreateVoiceSearchController(
-      ios::ChromeBrowserState* browser_state) const;
+      ChromeBrowserState* browser_state) const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VoiceSearchProvider);

ios/public/provider/chrome/browser/voice/voice_search_provider.mm

@@ -24,7 +24,6 @@ AudioSessionController* VoiceSearchProvider::GetAudioSessionController() const {
 
 scoped_refptr<VoiceSearchController>
 VoiceSearchProvider::CreateVoiceSearchController(
-    ios::ChromeBrowserState* browser_state) const {
+    ChromeBrowserState* browser_state) const {
   return scoped_refptr<VoiceSearchController>(nullptr);
 }
-