[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/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=rohitrao@chromium.org

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

ios/chrome/browser/tabs/tab_helper_util.mm

@@ -69,8 +69,8 @@ void AttachTabHelpers(web::WebState* web_state, bool for_prerender) {
   // TabIdHelper sets up the tab ID.
   TabIdTabHelper::CreateForWebState(web_state);
 
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(web_state->GetBrowserState());
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(web_state->GetBrowserState());
 
   // IOSChromeSessionTabHelper sets up the session ID used by other helpers,
   // so it needs to be created before them.
@@ -114,7 +114,7 @@ void AttachTabHelpers(web::WebState* web_state, bool for_prerender) {
   ImageFetchTabHelper::CreateForWebState(web_state);
 
   OpenInTabHelper::CreateForWebState(web_state);
-  ios::ChromeBrowserState* original_browser_state =
+  ChromeBrowserState* original_browser_state =
       browser_state->GetOriginalChromeBrowserState();
   favicon::WebFaviconDriver::CreateForWebState(
       web_state,

ios/chrome/browser/tabs/tab_model.h

@@ -8,9 +8,9 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/sessions/session_window_restoring.h"
 
+class ChromeBrowserState;
 @class SessionServiceIOS;
 class TabModelSyncedWindowDelegate;
 class TabUsageRecorder;
@@ -29,7 +29,7 @@ class Browser;
     TabModelSyncedWindowDelegate* syncedWindowDelegate;
 
 // BrowserState associated with this TabModel.
-@property(nonatomic, readonly) ios::ChromeBrowserState* browserState;
+@property(nonatomic, readonly) ChromeBrowserState* browserState;
 
 // Records UMA metrics about Tab usage.
 @property(nonatomic, readonly) TabUsageRecorder* tabUsageRecorder;

ios/chrome/browser/tabs/tab_model.mm

@@ -357,7 +357,7 @@ void RecordMainFrameNavigationMetric(web::WebState* web_state) {
                name:UIApplicationDidEnterBackgroundNotification
              object:nil];
 
-    // Associate with ios::ChromeBrowserState.
+    // Associate with ChromeBrowserState.
     TabModelList::RegisterTabModelWithChromeBrowserState(_browserState, self);
   }
   return self;
@@ -548,7 +548,7 @@ void RecordMainFrameNavigationMetric(web::WebState* web_state) {
 
   [[OmniboxGeolocationController sharedInstance]
       addLocationToNavigationItem:navigationItem
-                     browserState:ios::ChromeBrowserState::FromBrowserState(
+                     browserState:ChromeBrowserState::FromBrowserState(
                                       webState->GetBrowserState())];
 }
 

ios/chrome/browser/tabs/tab_model_list.h

@@ -8,14 +8,14 @@
 #import <Foundation/Foundation.h>
 
 #include "base/macros.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 
 @class TabModel;
 
+class ChromeBrowserState;
 class TabModelListObserver;
 
 // A class containing static functions to help maintain a 1:N relationship
-// between an ios::ChromeBrowserState and multiple TabModels.
+// between an ChromeBrowserState and multiple TabModels.
 class TabModelList {
  public:
   // Adds |observer| to the list of observers.
@@ -29,22 +29,22 @@ class TabModelList {
   // It is an error if |tab_model is already registered as associated to
   // |browser_state|.
   static void RegisterTabModelWithChromeBrowserState(
-      ios::ChromeBrowserState* browser_state,
+      ChromeBrowserState* browser_state,
       TabModel* tab_model);
 
   // Unregisters the association between |tab_model| and |browser_state|.
   // It is an error if no such association exists.
   static void UnregisterTabModelFromChromeBrowserState(
-      ios::ChromeBrowserState* browser_state,
+      ChromeBrowserState* browser_state,
       TabModel* tab_model);
 
   // Returns the list of all TabModels associated with |browser_state|.
   static NSArray<TabModel*>* GetTabModelsForChromeBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   // Returns the last active TabModel associated with |browser_state|.
   static TabModel* GetLastActiveTabModelForChromeBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   // Returns true if a incognito session is currently active (i.e. at least
   // one incognito tab is open).

ios/chrome/browser/tabs/tab_model_list.mm

@@ -28,7 +28,7 @@ class TabModelListUserData : public base::SupportsUserData::Data {
   ~TabModelListUserData() override;
 
   static TabModelListUserData* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state,
+      ChromeBrowserState* browser_state,
       bool create);
 
   NSMutableSet<TabModel*>* tab_models() const { return tab_models_; }
@@ -52,7 +52,7 @@ TabModelListUserData::~TabModelListUserData() {
 
 // static
 TabModelListUserData* TabModelListUserData::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     bool create) {
   TabModelListUserData* tab_model_list_user_data =
       static_cast<TabModelListUserData*>(
@@ -85,7 +85,7 @@ void TabModelList::RemoveObserver(TabModelListObserver* observer) {
 
 // static
 void TabModelList::RegisterTabModelWithChromeBrowserState(
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     TabModel* tab_model) {
   NSMutableSet<TabModel*>* tab_models =
       TabModelListUserData::GetForBrowserState(browser_state, true)
@@ -99,7 +99,7 @@ void TabModelList::RegisterTabModelWithChromeBrowserState(
 
 // static
 void TabModelList::UnregisterTabModelFromChromeBrowserState(
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     TabModel* tab_model) {
   NSMutableSet<TabModel*>* tab_models =
       TabModelListUserData::GetForBrowserState(browser_state, false)
@@ -113,7 +113,7 @@ void TabModelList::UnregisterTabModelFromChromeBrowserState(
 
 // static
 NSArray<TabModel*>* TabModelList::GetTabModelsForChromeBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   TabModelListUserData* tab_model_list_user_data =
       TabModelListUserData::GetForBrowserState(browser_state, false);
   return tab_model_list_user_data
@@ -123,7 +123,7 @@ NSArray<TabModel*>* TabModelList::GetTabModelsForChromeBrowserState(
 
 // static
 TabModel* TabModelList::GetLastActiveTabModelForChromeBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   TabModelListUserData* tab_model_list_user_data =
       TabModelListUserData::GetForBrowserState(browser_state, false);
   if (!tab_model_list_user_data ||
@@ -139,17 +139,17 @@ TabModel* TabModelList::GetLastActiveTabModelForChromeBrowserState(
 
 // static
 bool TabModelList::IsOffTheRecordSessionActive() {
-  std::vector<ios::ChromeBrowserState*> browser_states =
+  std::vector<ChromeBrowserState*> browser_states =
       GetApplicationContext()
           ->GetChromeBrowserStateManager()
           ->GetLoadedBrowserStates();
 
-  for (ios::ChromeBrowserState* browser_state : browser_states) {
+  for (ChromeBrowserState* browser_state : browser_states) {
     DCHECK(!browser_state->IsOffTheRecord());
     if (!browser_state->HasOffTheRecordChromeBrowserState())
       continue;
 
-    ios::ChromeBrowserState* otr_browser_state =
+    ChromeBrowserState* otr_browser_state =
         browser_state->GetOffTheRecordChromeBrowserState();
 
     TabModelListUserData* tab_model_list_user_data =

ios/chrome/browser/tabs/tab_model_list_observer.h

@@ -6,8 +6,8 @@
 #define IOS_CHROME_BROWSER_TABS_TAB_MODEL_LIST_OBSERVER_H_
 
 #include "base/macros.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 
+class ChromeBrowserState;
 @class TabModel;
 
 // Interface for getting notified when TabModels get associated/dissociated
@@ -20,12 +20,12 @@ class TabModelListObserver {
   // Called when |tab_model| is associated to |browser_state|.
   virtual void TabModelRegisteredWithBrowserState(
       TabModel* tab_model,
-      ios::ChromeBrowserState* browser_state) = 0;
+      ChromeBrowserState* browser_state) = 0;
 
   // Called when the |tab_model| is dissociated from |browser_state|.
   virtual void TabModelUnregisteredFromBrowserState(
       TabModel* tab_model,
-      ios::ChromeBrowserState* browser_state) = 0;
+      ChromeBrowserState* browser_state) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TabModelListObserver);

ios/chrome/browser/tabs/tab_model_list_unittest.mm

@@ -32,11 +32,9 @@ class MockTabModelListObserver : public TabModelListObserver {
   MockTabModelListObserver() : TabModelListObserver() {}
 
   MOCK_METHOD2(TabModelRegisteredWithBrowserState,
-               void(TabModel* tab_model,
-                    ios::ChromeBrowserState* browser_state));
+               void(TabModel* tab_model, ChromeBrowserState* browser_state));
   MOCK_METHOD2(TabModelUnregisteredFromBrowserState,
-               void(TabModel* tab_model,
-                    ios::ChromeBrowserState* browser_state));
+               void(TabModel* tab_model, ChromeBrowserState* browser_state));
 };
 
 class TabModelListTest : public PlatformTest {
@@ -66,11 +64,9 @@ class TabModelListTest : public PlatformTest {
     return TabModelList::GetTabModelsForChromeBrowserState(otr_browser_state());
   }
 
-  ios::ChromeBrowserState* browser_state() {
-    return browser_->GetBrowserState();
-  }
+  ChromeBrowserState* browser_state() { return browser_->GetBrowserState(); }
 
-  ios::ChromeBrowserState* otr_browser_state() {
+  ChromeBrowserState* otr_browser_state() {
     return otr_browser_->GetBrowserState();
   }
 

ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm

@@ -25,7 +25,7 @@ TabModelSyncedWindowDelegatesGetter::SyncedWindowDelegateMap
 TabModelSyncedWindowDelegatesGetter::GetSyncedWindowDelegates() {
   SyncedWindowDelegateMap synced_window_delegates;
 
-  std::vector<ios::ChromeBrowserState*> browser_states =
+  std::vector<ChromeBrowserState*> browser_states =
       GetApplicationContext()
           ->GetChromeBrowserStateManager()
           ->GetLoadedBrowserStates();