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

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

Bug: 1042208
Change-Id: I0e14f7124e29be264b164c36985bc0d2e5de5ab6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017505Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734911}

ios/chrome/browser/ui/content_suggestions/content_suggestions_app_interface.mm

@@ -62,7 +62,7 @@ ContentSuggestion CreateSuggestion(Category category,
 @implementation ContentSuggestionsAppInterface
 
 + (void)setUpService {
-  ios::ChromeBrowserState* browserState =
+  ChromeBrowserState* browserState =
       chrome_test_util::GetOriginalBrowserState();
   // Sets the ContentSuggestionsService associated with this browserState to a
   // service with no provider registered, allowing to register fake providers
@@ -79,7 +79,7 @@ ContentSuggestion CreateSuggestion(Category category,
 }
 
 + (void)resetService {
-  ios::ChromeBrowserState* browserState =
+  ChromeBrowserState* browserState =
       chrome_test_util::GetOriginalBrowserState();
 
   // Resets the Service associated with this browserState to a new service with
@@ -136,7 +136,7 @@ ContentSuggestion CreateSuggestion(Category category,
 
 + (NSString*)defaultSearchEngine {
   // Get the default Search Engine.
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   TemplateURLService* service =
       ios::TemplateURLServiceFactory::GetForBrowserState(browser_state);
@@ -149,7 +149,7 @@ ContentSuggestion CreateSuggestion(Category category,
       base::SysNSStringToUTF16(defaultSearchEngine);
   // Set the search engine back to the default in case the test fails before
   // cleaning it up.
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   TemplateURLService* service =
       ios::TemplateURLServiceFactory::GetForBrowserState(browser_state);

ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.h

@@ -5,9 +5,10 @@
 #ifndef IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_COORDINATOR_H_
 #define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_COORDINATOR_H_
 
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
 
+class ChromeBrowserState;
+
 namespace web {
 class WebState;
 }
@@ -25,7 +26,7 @@ class WebState;
 @interface ContentSuggestionsCoordinator : ChromeCoordinator
 
 // BrowserState used to create the ContentSuggestionFactory.
-@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
+@property(nonatomic, assign) ChromeBrowserState* browserState;
 // URLLoader used to open pages.
 @property(nonatomic, assign) web::WebState* webState;
 @property(nonatomic, weak) id<NewTabPageControllerDelegate> toolbarDelegate;

ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.mm

@@ -90,7 +90,7 @@
   contentSuggestionsService->user_classifier()->OnEvent(
       ntp_snippets::UserClassifier::Metric::SUGGESTIONS_SHOWN);
   PrefService* prefs =
-      ios::ChromeBrowserState::FromBrowserState(self.browserState)->GetPrefs();
+      ChromeBrowserState::FromBrowserState(self.browserState)->GetPrefs();
   bool contentSuggestionsEnabled =
       prefs->GetBoolean(prefs::kArticlesForYouEnabled);
   bool contentSuggestionsVisible =

ios/chrome/browser/ui/content_suggestions/ntp_home_metrics.h

@@ -7,9 +7,10 @@
 
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/metrics/new_tab_page_uma.h"
 
+class ChromeBrowserState;
+
 namespace web {
 class WebState;
 }
@@ -24,7 +25,7 @@ void RecordNTPImpression(ntp_home::IOSNTPImpression impression_type);
 // Metrics recorder for the action used to potentially leave the NTP.
 @interface NTPHomeMetrics : NSObject
 
-- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
+- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
                             webState:(web::WebState*)webState
     NS_DESIGNATED_INITIALIZER;
 - (instancetype)init NS_UNAVAILABLE;

ios/chrome/browser/ui/content_suggestions/ntp_home_metrics.mm

@@ -19,7 +19,7 @@ void RecordNTPImpression(IOSNTPImpression impression_type) {
 }  // namespace ntp_home
 
 @interface NTPHomeMetrics ()
-@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
+@property(nonatomic, assign) ChromeBrowserState* browserState;
 @property(nonatomic, assign) web::WebState* webState;
 @end
 
@@ -27,7 +27,7 @@ void RecordNTPImpression(IOSNTPImpression impression_type) {
 
 @synthesize browserState = _browserState;
 
-- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
+- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
                             webState:(web::WebState*)webState {
   self = [super init];
   if (self) {