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

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: I0fef4370bdd2a9376af40bc40f93c6fef949b625
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017325Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735276}

ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.h

@@ -7,15 +7,15 @@
 
 #include "base/macros.h"
 #include "components/sessions/core/tab_restore_service_client.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
+
+class ChromeBrowserState;
 
 // IOSChromeTabRestoreServiceClient provides an implementation of
 // TabRestoreServiceClient that depends on ios/chrome/.
 class IOSChromeTabRestoreServiceClient
     : public sessions::TabRestoreServiceClient {
  public:
-  explicit IOSChromeTabRestoreServiceClient(
-      ios::ChromeBrowserState* browser_state);
+  explicit IOSChromeTabRestoreServiceClient(ChromeBrowserState* browser_state);
   ~IOSChromeTabRestoreServiceClient() override;
 
  private:
@@ -37,7 +37,7 @@ class IOSChromeTabRestoreServiceClient
   void GetLastSession(sessions::GetLastSessionCallback callback,
                       base::CancelableTaskTracker* tracker) override;
 
-  ios::ChromeBrowserState* browser_state_;
+  ChromeBrowserState* browser_state_;
 
   DISALLOW_COPY_AND_ASSIGN(IOSChromeTabRestoreServiceClient);
 };

ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm

@@ -27,12 +27,12 @@
 namespace {
 sessions::LiveTabContext* FindLiveTabContextWithCondition(
     base::RepeatingCallback<bool(TabModel*)> condition) {
-  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());
     NSArray<TabModel*>* tab_models;
 
@@ -47,7 +47,7 @@ sessions::LiveTabContext* FindLiveTabContextWithCondition(
     if (!browser_state->HasOffTheRecordChromeBrowserState())
       continue;
 
-    ios::ChromeBrowserState* otr_browser_state =
+    ChromeBrowserState* otr_browser_state =
         browser_state->GetOffTheRecordChromeBrowserState();
 
     tab_models =
@@ -65,7 +65,7 @@ sessions::LiveTabContext* FindLiveTabContextWithCondition(
 }  // namespace
 
 IOSChromeTabRestoreServiceClient::IOSChromeTabRestoreServiceClient(
-    ios::ChromeBrowserState* browser_state)
+    ChromeBrowserState* browser_state)
     : browser_state_(browser_state) {}
 
 IOSChromeTabRestoreServiceClient::~IOSChromeTabRestoreServiceClient() {}

ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.cc

@@ -18,8 +18,8 @@ std::unique_ptr<KeyedService> BuildTabRestoreService(
     web::BrowserState* context) {
   DCHECK(!context->IsOffTheRecord());
 
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   return std::make_unique<sessions::TabRestoreServiceImpl>(
       base::WrapUnique(new IOSChromeTabRestoreServiceClient(browser_state)),
       browser_state->GetPrefs(), nullptr);
@@ -30,7 +30,7 @@ std::unique_ptr<KeyedService> BuildTabRestoreService(
 // static
 sessions::TabRestoreService*
 IOSChromeTabRestoreServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<sessions::TabRestoreService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }

ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h

@@ -10,7 +10,8 @@
 #include "base/macros.h"
 #include "base/no_destructor.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
+
+class ChromeBrowserState;
 
 namespace sessions {
 class TabRestoreService;
@@ -22,7 +23,7 @@ class IOSChromeTabRestoreServiceFactory
     : public BrowserStateKeyedServiceFactory {
  public:
   static sessions::TabRestoreService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static IOSChromeTabRestoreServiceFactory* GetInstance();
 

ios/chrome/browser/sessions/session_restoration_browser_agent.h

@@ -11,9 +11,9 @@
 
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #include "ios/chrome/browser/main/browser_user_data.h"
 
+class ChromeBrowserState;
 @class SessionWindowIOS;
 @class SessionIOSFactory;
 class SessionRestorationObserver;
@@ -69,7 +69,7 @@ class SessionRestorationBrowserAgent
 
   base::ObserverList<SessionRestorationObserver, true> observers_;
 
-  ios::ChromeBrowserState* browser_state_;
+  ChromeBrowserState* browser_state_;
 
   // Session Factory used to create session data for saving.
   SessionIOSFactory* session_ios_factory_;

ios/chrome/browser/sessions/session_util.h

@@ -9,7 +9,8 @@
 #include <vector>
 
 #include "base/callback.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
+
+class ChromeBrowserState;
 
 namespace sessions {
 class SerializedNavigationEntry;
@@ -25,7 +26,7 @@ namespace session_util {
 // Create a WebState initialized with |browser_state| and serialized navigation.
 // The returned WebState has web usage enabled.
 std::unique_ptr<web::WebState> CreateWebStateWithNavigationEntries(
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     int last_committed_item_index,
     const std::vector<sessions::SerializedNavigationEntry>& navigations);
 

ios/chrome/browser/sessions/session_util.mm

@@ -21,7 +21,7 @@
 namespace session_util {
 
 std::unique_ptr<web::WebState> CreateWebStateWithNavigationEntries(
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     int last_committed_item_index,
     const std::vector<sessions::SerializedNavigationEntry>& navigations) {
   DCHECK_GE(last_committed_item_index, 0);

ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.h

@@ -13,8 +13,8 @@
 #include "components/sessions/core/live_tab_context.h"
 #include "components/tab_groups/tab_group_id.h"
 #include "components/tab_groups/tab_group_visual_data.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 
+class ChromeBrowserState;
 class WebStateList;
 
 // Implementation of sessions::LiveTabContext which uses an instance
@@ -22,8 +22,7 @@ class WebStateList;
 class TabRestoreServiceDelegateImplIOS : public sessions::LiveTabContext,
                                          public KeyedService {
  public:
-  explicit TabRestoreServiceDelegateImplIOS(
-      ios::ChromeBrowserState* browser_state);
+  explicit TabRestoreServiceDelegateImplIOS(ChromeBrowserState* browser_state);
   ~TabRestoreServiceDelegateImplIOS() override;
 
   // Overridden from KeyedService:
@@ -74,7 +73,7 @@ class TabRestoreServiceDelegateImplIOS : public sessions::LiveTabContext,
   // Retrieves the current |WebStateList| corresponding to |browser_state_|;
   WebStateList* GetWebStateList() const;
 
-  ios::ChromeBrowserState* browser_state_;  // weak
+  ChromeBrowserState* browser_state_;  // weak
   SessionID session_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreServiceDelegateImplIOS);

ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm

@@ -26,7 +26,7 @@
 #endif
 
 TabRestoreServiceDelegateImplIOS::TabRestoreServiceDelegateImplIOS(
-    ios::ChromeBrowserState* browser_state)
+    ChromeBrowserState* browser_state)
     : browser_state_(browser_state), session_id_(SessionID::NewUnique()) {}
 
 TabRestoreServiceDelegateImplIOS::~TabRestoreServiceDelegateImplIOS() {}

ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios_factory.h

@@ -10,15 +10,15 @@
 #include "base/macros.h"
 #include "base/no_destructor.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 
+class ChromeBrowserState;
 class TabRestoreServiceDelegateImplIOS;
 
 class TabRestoreServiceDelegateImplIOSFactory
     : public BrowserStateKeyedServiceFactory {
  public:
   static TabRestoreServiceDelegateImplIOS* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static TabRestoreServiceDelegateImplIOSFactory* GetInstance();
 

ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios_factory.mm

@@ -18,7 +18,7 @@
 // static
 TabRestoreServiceDelegateImplIOS*
 TabRestoreServiceDelegateImplIOSFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<TabRestoreServiceDelegateImplIOS*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -43,5 +43,5 @@ std::unique_ptr<KeyedService>
 TabRestoreServiceDelegateImplIOSFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
   return std::make_unique<TabRestoreServiceDelegateImplIOS>(
-      ios::ChromeBrowserState::FromBrowserState(context));
+      ChromeBrowserState::FromBrowserState(context));
 }