[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/test

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: I2ac990201f0de9332a204023c8ad2ebbf18a9407
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017347
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734600}

ios/chrome/test/app/bookmarks_test_util.mm

@@ -22,7 +22,7 @@ bool BookmarksLoaded() {
 }
 
 bool ClearBookmarks() {
-  ios::ChromeBrowserState* browserState = GetOriginalBrowserState();
+  ChromeBrowserState* browserState = GetOriginalBrowserState();
   bookmarks::BookmarkModel* bookmarkModel =
       ios::BookmarkModelFactory::GetForBrowserState(browserState);
   BOOL removeSucceeded = RemoveAllUserBookmarksIOS(browserState);

ios/chrome/test/app/browsing_data_test_util.mm

@@ -28,7 +28,7 @@ using base::test::ios::WaitUntilConditionOrTimeout;
 namespace {
 
 bool ClearBrowsingData(bool off_the_record, BrowsingDataRemoveMask mask) {
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       off_the_record ? chrome_test_util::GetCurrentIncognitoBrowserState()
                      : chrome_test_util::GetOriginalBrowserState();
 
@@ -81,8 +81,8 @@ bool ClearAllWebStateBrowsingData() {
 }
 
 bool ClearCertificatePolicyCache(bool off_the_record) {
-  ios::ChromeBrowserState* browser_state =
-      off_the_record ? GetCurrentIncognitoBrowserState()
+  ChromeBrowserState* browser_state = off_the_record
+                                          ? GetCurrentIncognitoBrowserState()
                                           : GetOriginalBrowserState();
   auto cache = web::BrowserState::GetCertificatePolicyCache(browser_state);
   __block BOOL policies_cleared = NO;

ios/chrome/test/app/chrome_test_util.h

@@ -8,10 +8,10 @@
 
 #include "base/compiler_specific.h"
 #import "base/ios/block_types.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 
 @protocol ApplicationCommands;
+class ChromeBrowserState;
 @class DeviceSharingManager;
 @class MainController;
 @class NewTabPageController;
@@ -26,10 +26,10 @@ MainController* GetMainController();
 DeviceSharingManager* GetDeviceSharingManager();
 
 // Returns the current, non-incognito ChromeBrowserState.
-ios::ChromeBrowserState* GetOriginalBrowserState();
+ChromeBrowserState* GetOriginalBrowserState();
 
 // Returns the current incognito ChromeBrowserState
-ios::ChromeBrowserState* GetCurrentIncognitoBrowserState();
+ChromeBrowserState* GetCurrentIncognitoBrowserState();
 
 // Returns the dispatcher for the main BVC.
 // TODO(crbug.com/738881): Use DispatcherForActiveBrowserViewController()
@@ -57,7 +57,7 @@ void ClearPresentedState();
 void SetBooleanLocalStatePref(const char* pref_name, bool value);
 
 // Sets the value of a boolean user pref in the given browser state.
-void SetBooleanUserPref(ios::ChromeBrowserState* browser_state,
+void SetBooleanUserPref(ChromeBrowserState* browser_state,
                         const char* pref_name,
                         bool value);
 

ios/chrome/test/app/chrome_test_util.mm

@@ -56,14 +56,14 @@
 namespace {
 // Returns the original ChromeBrowserState if |incognito| is false. If
 // |ingonito| is true, returns an off-the-record ChromeBrowserState.
-ios::ChromeBrowserState* GetBrowserState(bool incognito) {
-  std::vector<ios::ChromeBrowserState*> browser_states =
+ChromeBrowserState* GetBrowserState(bool incognito) {
+  std::vector<ChromeBrowserState*> browser_states =
       GetApplicationContext()
           ->GetChromeBrowserStateManager()
           ->GetLoadedBrowserStates();
   DCHECK(!browser_states.empty());
 
-  ios::ChromeBrowserState* browser_state = browser_states.front();
+  ChromeBrowserState* browser_state = browser_states.front();
   DCHECK(!browser_state->IsOffTheRecord());
 
   return incognito ? browser_state->GetOffTheRecordChromeBrowserState()
@@ -82,11 +82,11 @@ DeviceSharingManager* GetDeviceSharingManager() {
   return [GetMainController() deviceSharingManager];
 }
 
-ios::ChromeBrowserState* GetOriginalBrowserState() {
+ChromeBrowserState* GetOriginalBrowserState() {
   return GetBrowserState(false);
 }
 
-ios::ChromeBrowserState* GetCurrentIncognitoBrowserState() {
+ChromeBrowserState* GetCurrentIncognitoBrowserState() {
   return GetBrowserState(true);
 }
 
@@ -156,7 +156,7 @@ void SetBooleanLocalStatePref(const char* pref_name, bool value) {
   pref.SetValue(value);
 }
 
-void SetBooleanUserPref(ios::ChromeBrowserState* browser_state,
+void SetBooleanUserPref(ChromeBrowserState* browser_state,
                         const char* pref_name,
                         bool value) {
   DCHECK(browser_state);

ios/chrome/test/app/settings_test_util.mm

@@ -15,7 +15,7 @@
 namespace chrome_test_util {
 
 void SetContentSettingsBlockPopups(ContentSetting setting) {
-  ios::ChromeBrowserState* browser_state = GetOriginalBrowserState();
+  ChromeBrowserState* browser_state = GetOriginalBrowserState();
   HostContentSettingsMap* settings_map =
       ios::HostContentSettingsMapFactory::GetForBrowserState(browser_state);
   settings_map->SetDefaultContentSetting(ContentSettingsType::POPUPS, setting);

ios/chrome/test/app/signin_test_util.mm

@@ -97,7 +97,7 @@ bool SignOutAndClearAccounts() {
   // important to autorelease all objects that make network requests to avoid
   // EarlGrey being confused about on-going network traffic..
   @autoreleasepool {
-    ios::ChromeBrowserState* browser_state = GetOriginalBrowserState();
+    ChromeBrowserState* browser_state = GetOriginalBrowserState();
     DCHECK(browser_state);
 
     // Sign out current user.
@@ -127,7 +127,7 @@ void ResetMockAuthentication() {
 }
 
 void ResetSigninPromoPreferences() {
-  ios::ChromeBrowserState* browser_state = GetOriginalBrowserState();
+  ChromeBrowserState* browser_state = GetOriginalBrowserState();
   PrefService* prefs = browser_state->GetPrefs();
   prefs->SetInteger(prefs::kIosBookmarkSigninPromoDisplayedCount, 0);
   prefs->SetBoolean(prefs::kIosBookmarkPromoAlreadySeen, false);

ios/chrome/test/app/sync_test_util.mm

@@ -50,7 +50,7 @@ NSString* const kSyncTestErrorDomain = @"SyncTestDomain";
 // |create_http_post_provider_factory_cb|.
 void OverrideSyncNetwork(const syncer::CreateHttpPostProviderFactory&
                              create_http_post_provider_factory_cb) {
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   DCHECK(browser_state);
   syncer::ProfileSyncService* service =
@@ -79,7 +79,7 @@ void TearDownFakeSyncServer() {
 
 void StartSync() {
   DCHECK(!IsSyncInitialized());
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   SyncSetupService* sync_setup_service =
       SyncSetupServiceFactory::GetForBrowserState(browser_state);
@@ -88,7 +88,7 @@ void StartSync() {
 
 void StopSync() {
   DCHECK(IsSyncInitialized());
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   SyncSetupService* sync_setup_service =
       SyncSetupServiceFactory::GetForBrowserState(browser_state);
@@ -96,7 +96,7 @@ void StopSync() {
 }
 
 void TriggerSyncCycle(syncer::ModelType type) {
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   syncer::SyncService* sync_service =
       ProfileSyncServiceFactory::GetForBrowserState(browser_state);
@@ -150,7 +150,7 @@ void InjectBookmarkOnFakeSyncServer(std::string url, std::string title) {
 }
 
 bool IsSyncInitialized() {
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   DCHECK(browser_state);
   syncer::SyncService* syncService =
@@ -160,7 +160,7 @@ bool IsSyncInitialized() {
 
 std::string GetSyncCacheGuid() {
   DCHECK(IsSyncInitialized());
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   syncer::DeviceInfoSyncService* service =
       DeviceInfoSyncServiceFactory::GetForBrowserState(browser_state);
@@ -208,7 +208,7 @@ void DeleteAutofillProfileOnFakeSyncServer(std::string guid) {
 }
 
 bool IsAutofillProfilePresent(std::string guid, std::string full_name) {
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   autofill::PersonalDataManager* personal_data_manager =
       autofill::PersonalDataManagerFactory::GetForBrowserState(browser_state);
@@ -224,7 +224,7 @@ bool IsAutofillProfilePresent(std::string guid, std::string full_name) {
 }
 
 void ClearAutofillProfile(std::string guid) {
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   autofill::PersonalDataManager* personal_data_manager =
       autofill::PersonalDataManagerFactory::GetForBrowserState(browser_state);
@@ -251,7 +251,7 @@ BOOL VerifySessionsOnSyncServer(const std::multiset<std::string>& expected_urls,
 }
 
 void AddTypedURLOnClient(const GURL& url) {
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   history::HistoryService* historyService =
       ios::HistoryServiceFactory::GetForBrowserState(
@@ -282,7 +282,7 @@ BOOL IsTypedUrlPresentOnClient(const GURL& url,
                                BOOL expect_present,
                                NSError** error) {
   // Call the history service.
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   history::HistoryService* history_service =
       ios::HistoryServiceFactory::GetForBrowserState(
@@ -330,7 +330,7 @@ BOOL IsTypedUrlPresentOnClient(const GURL& url,
 }
 
 void DeleteTypedUrlFromClient(const GURL& url) {
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   history::HistoryService* history_service =
       ios::HistoryServiceFactory::GetForBrowserState(

ios/chrome/test/app/tab_test_util.mm

@@ -215,7 +215,7 @@ void SaveSessionImmediately() {
 
 void EvictOtherTabModelTabs() {
   id<BrowserInterfaceProvider> provider = GetMainController().interfaceProvider;
-  ios::ChromeBrowserState* otherBrowserState =
+  ChromeBrowserState* otherBrowserState =
       IsIncognitoMode() ? provider.mainInterface.browserState
                         : provider.incognitoInterface.browserState;
   // Disabling and enabling web usage will evict all web views.