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

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

Bug: 1042208
Change-Id: I5fe3c2717a2c4493756176dc5d2443ab87efd342
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015253
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734588}

ios/chrome/browser/ui/recent_tabs/recent_tabs_coordinator.h

@@ -18,8 +18,7 @@ enum class UrlLoadStrategy;
 
 // Use initWithBaseViewController:browser:
 - (instancetype)initWithBaseViewController:(UIViewController*)viewController
-                              browserState:
-                                  (ios::ChromeBrowserState*)browserState
+                              browserState:(ChromeBrowserState*)browserState
     NS_UNAVAILABLE;
 
 @end

ios/chrome/browser/ui/recent_tabs/recent_tabs_coordinator_unittest.mm

@@ -49,8 +49,8 @@ namespace {
 
 std::unique_ptr<KeyedService> CreateSyncSetupService(
     web::BrowserState* context) {
-  ios::ChromeBrowserState* chrome_browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* chrome_browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   syncer::SyncService* sync_service =
       ProfileSyncServiceFactory::GetForBrowserState(chrome_browser_state);
   return std::make_unique<testing::NiceMock<SyncSetupServiceMock>>(

ios/chrome/browser/ui/recent_tabs/recent_tabs_mediator.h

@@ -7,12 +7,12 @@
 
 #import <Foundation/Foundation.h>
 
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/ui/recent_tabs/closed_tabs_observer_bridge.h"
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/recent_tabs/synced_sessions_bridge.h"
 #import "ios/chrome/browser/ui/table_view/table_view_favicon_data_source.h"
 
+class ChromeBrowserState;
 class WebStateList;
 
 @protocol RecentTabsConsumer;
@@ -32,7 +32,7 @@ class WebStateList;
 @property(nonatomic, strong) id<RecentTabsConsumer> consumer;
 
 // The coordinator's BrowserState.
-@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
+@property(nonatomic, assign) ChromeBrowserState* browserState;
 
 // The WebStateList that this mediator listens for.
 @property(nonatomic, assign) WebStateList* webStateList;

ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.h

@@ -5,11 +5,11 @@
 #ifndef IOS_CHROME_BROWSER_UI_RECENT_TABS_RECENT_TABS_TABLE_VIEW_CONTROLLER_H_
 #define IOS_CHROME_BROWSER_UI_RECENT_TABS_RECENT_TABS_TABLE_VIEW_CONTROLLER_H_
 
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_consumer.h"
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
 #include "ui/base/window_open_disposition.h"
 
+class ChromeBrowserState;
 enum class UrlLoadStrategy;
 class WebStateList;
 
@@ -22,7 +22,7 @@ class WebStateList;
     : ChromeTableViewController <RecentTabsConsumer,
                                  UIAdaptivePresentationControllerDelegate>
 // The coordinator's BrowserState.
-@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
+@property(nonatomic, assign) ChromeBrowserState* browserState;
 // The command handler used by this ViewController.
 @property(nonatomic, weak) id<ApplicationCommands> handler;
 // Opaque instructions on how to open urls.

ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm

@@ -175,7 +175,7 @@ const int kRecentlyClosedTabsSectionIndex = 0;
 // BrowserState, in order to prevent crashes set |_browserState| to
 // |browserState|->OriginalChromeBrowserState. While doing this check if
 // incognito or not so that pages are loaded accordingly.
-- (void)setBrowserState:(ios::ChromeBrowserState*)browserState {
+- (void)setBrowserState:(ChromeBrowserState*)browserState {
   if (browserState) {
     _browserState = browserState->GetOriginalChromeBrowserState();
     _incognito = browserState->IsOffTheRecord();

ios/chrome/browser/ui/recent_tabs/synced_sessions_bridge.h

@@ -12,7 +12,8 @@
 #include "base/callback_list.h"
 #include "base/macros.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
+
+class ChromeBrowserState;
 
 namespace signin {
 class IdentityManager;
@@ -30,7 +31,7 @@ namespace synced_sessions {
 class SyncedSessionsObserverBridge : public signin::IdentityManager::Observer {
  public:
   SyncedSessionsObserverBridge(id<SyncedSessionsObserver> owner,
-                               ios::ChromeBrowserState* browserState);
+                               ChromeBrowserState* browserState);
   ~SyncedSessionsObserverBridge() override;
   // signin::IdentityManager::Observer implementation.
   void OnPrimaryAccountCleared(

ios/chrome/browser/ui/recent_tabs/synced_sessions_bridge.mm

@@ -21,7 +21,7 @@ namespace synced_sessions {
 
 SyncedSessionsObserverBridge::SyncedSessionsObserverBridge(
     id<SyncedSessionsObserver> owner,
-    ios::ChromeBrowserState* browserState)
+    ChromeBrowserState* browserState)
     : owner_(owner),
       identity_manager_(
           IdentityManagerFactory::GetForBrowserState(browserState)),