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

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

Bug: 1042208
Change-Id: I3ad84430894a8b0bd355680007ee07cebf5a46e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014976
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: vitaliii <vitaliii@chromium.org>
Commit-Queue: vitaliii <vitaliii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734551}

ios/chrome/browser/sync/device_info_sync_service_factory.h

@@ -10,7 +10,8 @@
 
 #include "base/macros.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 base {
 template <typename T>
@@ -23,11 +24,11 @@ class DeviceInfoTracker;
 }  // namespace syncer
 
 // Singleton that owns all DeviceInfoSyncService and associates them with
-// ios::ChromeBrowserState.
+// ChromeBrowserState.
 class DeviceInfoSyncServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static syncer::DeviceInfoSyncService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static DeviceInfoSyncServiceFactory* GetInstance();
 

ios/chrome/browser/sync/device_info_sync_service_factory.mm

@@ -59,7 +59,7 @@ class DeviceInfoSyncClient : public syncer::DeviceInfoSyncClient {
 
 // static
 syncer::DeviceInfoSyncService* DeviceInfoSyncServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<syncer::DeviceInfoSyncService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -73,11 +73,11 @@ DeviceInfoSyncServiceFactory* DeviceInfoSyncServiceFactory::GetInstance() {
 void DeviceInfoSyncServiceFactory::GetAllDeviceInfoTrackers(
     std::vector<const syncer::DeviceInfoTracker*>* trackers) {
   DCHECK(trackers);
-  std::vector<ios::ChromeBrowserState*> browser_state_list =
+  std::vector<ChromeBrowserState*> browser_state_list =
       GetApplicationContext()
           ->GetChromeBrowserStateManager()
           ->GetLoadedBrowserStates();
-  for (ios::ChromeBrowserState* browser_state : browser_state_list) {
+  for (ChromeBrowserState* browser_state : browser_state_list) {
     syncer::DeviceInfoSyncService* service =
         DeviceInfoSyncServiceFactory::GetForBrowserState(browser_state);
     if (service != nullptr) {
@@ -102,8 +102,8 @@ DeviceInfoSyncServiceFactory::~DeviceInfoSyncServiceFactory() {}
 std::unique_ptr<KeyedService>
 DeviceInfoSyncServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
 
   auto device_info_sync_client =
       std::make_unique<DeviceInfoSyncClient>(browser_state->GetPrefs());

ios/chrome/browser/sync/glue/sync_start_util.cc

@@ -21,7 +21,7 @@ namespace {
 
 void StartSyncOnUIThread(const base::FilePath& browser_state_path,
                          syncer::ModelType type) {
-  ios::ChromeBrowserStateManager* browser_state_manager =
+  ChromeBrowserStateManager* browser_state_manager =
       GetApplicationContext()->GetChromeBrowserStateManager();
   if (!browser_state_manager) {
     // Can happen in tests.
@@ -29,7 +29,7 @@ void StartSyncOnUIThread(const base::FilePath& browser_state_path,
     return;
   }
 
-  ios::ChromeBrowserState* browser_state =
+  ChromeBrowserState* browser_state =
       browser_state_manager->GetBrowserState(browser_state_path);
   if (!browser_state) {
     DVLOG(2) << "ChromeBrowserState not found, can't start sync.";

ios/chrome/browser/sync/ios_chrome_sync_client.h

@@ -12,7 +12,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "components/browser_sync/browser_sync_client.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
+
+class ChromeBrowserState;
 
 namespace autofill {
 class AutofillWebDataService;
@@ -28,7 +29,7 @@ class ProfileSyncComponentsFactoryImpl;
 
 class IOSChromeSyncClient : public browser_sync::BrowserSyncClient {
  public:
-  explicit IOSChromeSyncClient(ios::ChromeBrowserState* browser_state);
+  explicit IOSChromeSyncClient(ChromeBrowserState* browser_state);
   ~IOSChromeSyncClient() override;
 
   // BrowserSyncClient implementation.
@@ -59,7 +60,7 @@ class IOSChromeSyncClient : public browser_sync::BrowserSyncClient {
   syncer::SyncTypePreferenceProvider* GetPreferenceProvider() override;
 
  private:
-  ios::ChromeBrowserState* const browser_state_;
+  ChromeBrowserState* const browser_state_;
 
   // The sync api component factory in use by this client.
   // TODO(crbug.com/915154): Revert to SyncApiComponentFactory once common

ios/chrome/browser/sync/ios_chrome_sync_client.mm

@@ -90,7 +90,7 @@ syncer::ModelTypeSet GetDisabledTypesFromCommandLine() {
 
 }  // namespace
 
-IOSChromeSyncClient::IOSChromeSyncClient(ios::ChromeBrowserState* browser_state)
+IOSChromeSyncClient::IOSChromeSyncClient(ChromeBrowserState* browser_state)
     : browser_state_(browser_state) {
   profile_web_data_service_ =
       ios::WebDataServiceFactory::GetAutofillWebDataForBrowserState(

ios/chrome/browser/sync/ios_user_event_service_factory.cc

@@ -27,7 +27,7 @@
 
 // static
 syncer::UserEventService* IOSUserEventServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<syncer::UserEventService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -55,8 +55,8 @@ IOSUserEventServiceFactory::BuildServiceInstanceFor(
     return std::make_unique<syncer::NoOpUserEventService>();
   }
 
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   syncer::OnceModelTypeStoreFactory store_factory =
       ModelTypeStoreServiceFactory::GetForBrowserState(browser_state)
           ->GetStoreFactory();

ios/chrome/browser/sync/ios_user_event_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 syncer {
 class UserEventService;
@@ -20,7 +21,7 @@ class UserEventService;
 class IOSUserEventServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static syncer::UserEventService* GetForBrowserState(
-      ios::ChromeBrowserState* context);
+      ChromeBrowserState* context);
 
   static IOSUserEventServiceFactory* GetInstance();
 

ios/chrome/browser/sync/model_type_store_service_factory.cc

@@ -20,7 +20,7 @@ ModelTypeStoreServiceFactory* ModelTypeStoreServiceFactory::GetInstance() {
 
 // static
 syncer::ModelTypeStoreService* ModelTypeStoreServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<syncer::ModelTypeStoreService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -35,8 +35,8 @@ ModelTypeStoreServiceFactory::~ModelTypeStoreServiceFactory() {}
 std::unique_ptr<KeyedService>
 ModelTypeStoreServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   return std::make_unique<syncer::ModelTypeStoreServiceImpl>(
       browser_state->GetStatePath());
 }

ios/chrome/browser/sync/model_type_store_service_factory.h

@@ -10,18 +10,19 @@
 #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 syncer {
 class ModelTypeStoreService;
 }  // namespace syncer
 
 // Singleton that owns all ModelTypeStoreService and associates them with
-// ios::ChromeBrowserState.
+// ChromeBrowserState.
 class ModelTypeStoreServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static syncer::ModelTypeStoreService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static ModelTypeStoreServiceFactory* GetInstance();
 

ios/chrome/browser/sync/profile_sync_service_factory.cc

@@ -80,7 +80,7 @@ ProfileSyncServiceFactory* ProfileSyncServiceFactory::GetInstance() {
 
 // static
 syncer::SyncService* ProfileSyncServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   if (!switches::IsSyncAllowedByFlag())
     return nullptr;
 
@@ -90,7 +90,7 @@ syncer::SyncService* ProfileSyncServiceFactory::GetForBrowserState(
 
 // static
 syncer::SyncService* ProfileSyncServiceFactory::GetForBrowserStateIfExists(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   if (!switches::IsSyncAllowedByFlag())
     return nullptr;
 
@@ -101,7 +101,7 @@ syncer::SyncService* ProfileSyncServiceFactory::GetForBrowserStateIfExists(
 // static
 syncer::ProfileSyncService*
 ProfileSyncServiceFactory::GetAsProfileSyncServiceForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<syncer::ProfileSyncService*>(
       GetForBrowserState(browser_state));
 }
@@ -109,7 +109,7 @@ ProfileSyncServiceFactory::GetAsProfileSyncServiceForBrowserState(
 // static
 syncer::ProfileSyncService*
 ProfileSyncServiceFactory::GetAsProfileSyncServiceForBrowserStateIfExists(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<syncer::ProfileSyncService*>(
       GetForBrowserStateIfExists(browser_state));
 }
@@ -149,8 +149,8 @@ ProfileSyncServiceFactory::~ProfileSyncServiceFactory() {}
 std::unique_ptr<KeyedService>
 ProfileSyncServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
 
   // Always create the GCMProfileService instance such that we can listen to
   // the profile notifications and purge the GCM store when the profile is

ios/chrome/browser/sync/profile_sync_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 syncer {
 class ProfileSyncService;
@@ -18,21 +19,21 @@ class SyncService;
 }  // namespace syncer
 
 // Singleton that owns all SyncServices and associates them with
-// ios::ChromeBrowserState.
+// ChromeBrowserState.
 class ProfileSyncServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static syncer::SyncService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static syncer::SyncService* GetForBrowserStateIfExists(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static syncer::ProfileSyncService* GetAsProfileSyncServiceForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static syncer::ProfileSyncService*
   GetAsProfileSyncServiceForBrowserStateIfExists(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static ProfileSyncServiceFactory* GetInstance();
 

ios/chrome/browser/sync/profile_sync_service_factory_unittest.cc

@@ -101,7 +101,7 @@ class ProfileSyncServiceFactoryTest : public PlatformTest {
         syncer::ModelTypeSetToString(disabled_types));
   }
 
-  ios::ChromeBrowserState* chrome_browser_state() {
+  ChromeBrowserState* chrome_browser_state() {
     return chrome_browser_state_.get();
   }
 

ios/chrome/browser/sync/send_tab_to_self_sync_service_factory.h

@@ -10,18 +10,19 @@
 #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 send_tab_to_self {
 class SendTabToSelfSyncService;
 }  // namespace send_tab_to_self
 
 // Singleton that owns all SendTabToSelfSyncService and associates them with
-// ios::ChromeBrowserState.
+// ChromeBrowserState.
 class SendTabToSelfSyncServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static send_tab_to_self::SendTabToSelfSyncService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static SendTabToSelfSyncServiceFactory* GetInstance();
 

ios/chrome/browser/sync/send_tab_to_self_sync_service_factory.mm

@@ -29,7 +29,7 @@ SendTabToSelfSyncServiceFactory::GetInstance() {
 
 // static
 SendTabToSelfSyncService* SendTabToSelfSyncServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<SendTabToSelfSyncService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -48,8 +48,8 @@ SendTabToSelfSyncServiceFactory::~SendTabToSelfSyncServiceFactory() {}
 std::unique_ptr<KeyedService>
 SendTabToSelfSyncServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
 
   syncer::OnceModelTypeStoreFactory store_factory =
       ModelTypeStoreServiceFactory::GetForBrowserState(browser_state)

ios/chrome/browser/sync/session_sync_service_factory.h

@@ -10,8 +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;
 class GURL;
 
 namespace sync_sessions {
@@ -19,11 +19,11 @@ class SessionSyncService;
 }  // namespace sync_sessions
 
 // Singleton that owns all SessionSyncService and associates them with
-// ios::ChromeBrowserState.
+// ChromeBrowserState.
 class SessionSyncServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static sync_sessions::SessionSyncService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static SessionSyncServiceFactory* GetInstance();
 

ios/chrome/browser/sync/session_sync_service_factory.mm

@@ -53,7 +53,7 @@ bool ShouldSyncURLImpl(const GURL& url) {
 // might inherit from other interfaces with same methods.
 class SyncSessionsClientImpl : public sync_sessions::SyncSessionsClient {
  public:
-  explicit SyncSessionsClientImpl(ios::ChromeBrowserState* browser_state)
+  explicit SyncSessionsClientImpl(ChromeBrowserState* browser_state)
       : browser_state_(browser_state),
         window_delegates_getter_(
             std::make_unique<TabModelSyncedWindowDelegatesGetter>()),
@@ -104,7 +104,7 @@ class SyncSessionsClientImpl : public sync_sessions::SyncSessionsClient {
   }
 
  private:
-  ios::ChromeBrowserState* const browser_state_;
+  ChromeBrowserState* const browser_state_;
   const std::unique_ptr<sync_sessions::SyncedWindowDelegatesGetter>
       window_delegates_getter_;
   const std::unique_ptr<IOSChromeLocalSessionEventRouter>
@@ -129,7 +129,7 @@ bool SessionSyncServiceFactory::ShouldSyncURLForTesting(const GURL& url) {
 
 // static
 SessionSyncService* SessionSyncServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<SessionSyncService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ -148,8 +148,8 @@ SessionSyncServiceFactory::~SessionSyncServiceFactory() {}
 std::unique_ptr<KeyedService>
 SessionSyncServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   return std::make_unique<sync_sessions::SessionSyncServiceImpl>(
       ::GetChannel(), std::make_unique<SyncSessionsClientImpl>(browser_state));
 }

ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.h

@@ -14,11 +14,11 @@
 #include "base/macros.h"
 #include "components/sync/model/syncable_service.h"
 #include "components/sync_sessions/local_session_event_router.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
 #import "ios/chrome/browser/tabs/tab_model_list_observer.h"
 #include "ios/chrome/browser/web_state_list/web_state_list_observer.h"
 #include "ios/web/public/web_state_observer.h"
 
+class ChromeBrowserState;
 class GURL;
 
 namespace sync_sessions {
@@ -34,7 +34,7 @@ class IOSChromeLocalSessionEventRouter
       public TabModelListObserver {
  public:
   IOSChromeLocalSessionEventRouter(
-      ios::ChromeBrowserState* browser_state,
+      ChromeBrowserState* browser_state,
       sync_sessions::SyncSessionsClient* sessions_client_,
       const syncer::SyncableService::StartSyncFlare& flare);
   ~IOSChromeLocalSessionEventRouter() override;
@@ -47,10 +47,10 @@ class IOSChromeLocalSessionEventRouter
   // TabModelListObserver:
   void TabModelRegisteredWithBrowserState(
       TabModel* tab_model,
-      ios::ChromeBrowserState* browser_state) override;
+      ChromeBrowserState* browser_state) override;
   void TabModelUnregisteredFromBrowserState(
       TabModel* tab_model,
-      ios::ChromeBrowserState* browser_state) override;
+      ChromeBrowserState* browser_state) override;
 
   // web::WebStateObserver:
   void TitleWasSet(web::WebState* web_state) override;
@@ -96,7 +96,7 @@ class IOSChromeLocalSessionEventRouter
   void OnFaviconsChanged(const std::set<GURL>& page_urls, const GURL& icon_url);
 
   sync_sessions::LocalSessionEventHandler* handler_;
-  ios::ChromeBrowserState* const browser_state_;
+  ChromeBrowserState* const browser_state_;
   sync_sessions::SyncSessionsClient* const sessions_client_;
   syncer::SyncableService::StartSyncFlare flare_;
 

ios/chrome/browser/sync/sessions/ios_chrome_local_session_event_router.mm

@@ -37,7 +37,7 @@ sync_sessions::SyncedTabDelegate* GetSyncedTabDelegateFromWebState(
 }  // namespace
 
 IOSChromeLocalSessionEventRouter::IOSChromeLocalSessionEventRouter(
-    ios::ChromeBrowserState* browser_state,
+    ChromeBrowserState* browser_state,
     sync_sessions::SyncSessionsClient* sessions_client,
     const syncer::SyncableService::StartSyncFlare& flare)
     : handler_(NULL),
@@ -76,13 +76,13 @@ IOSChromeLocalSessionEventRouter::~IOSChromeLocalSessionEventRouter() {
 
 void IOSChromeLocalSessionEventRouter::TabModelRegisteredWithBrowserState(
     TabModel* tab_model,
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   StartObservingWebStateList(tab_model.webStateList);
 }
 
 void IOSChromeLocalSessionEventRouter::TabModelUnregisteredFromBrowserState(
     TabModel* tab_model,
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   StopObservingWebStateList(tab_model.webStateList);
 }
 

ios/chrome/browser/sync/sync_setup_service_factory.cc

@@ -13,14 +13,14 @@
 
 // static
 SyncSetupService* SyncSetupServiceFactory::GetForBrowserState(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<SyncSetupService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
 
 // static
 SyncSetupService* SyncSetupServiceFactory::GetForBrowserStateIfExists(
-    ios::ChromeBrowserState* browser_state) {
+    ChromeBrowserState* browser_state) {
   return static_cast<SyncSetupService*>(
       GetInstance()->GetServiceForBrowserState(browser_state, false));
 }
@@ -43,8 +43,8 @@ SyncSetupServiceFactory::~SyncSetupServiceFactory() {
 
 std::unique_ptr<KeyedService> SyncSetupServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
-  ios::ChromeBrowserState* browser_state =
-      ios::ChromeBrowserState::FromBrowserState(context);
+  ChromeBrowserState* browser_state =
+      ChromeBrowserState::FromBrowserState(context);
   return std::make_unique<SyncSetupService>(
       ProfileSyncServiceFactory::GetForBrowserState(browser_state));
 }

ios/chrome/browser/sync/sync_setup_service_factory.h

@@ -10,8 +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;
 class SyncSetupService;
 
 // Singleton that owns all SyncSetupServices and associates them with
@@ -19,9 +19,9 @@ class SyncSetupService;
 class SyncSetupServiceFactory : public BrowserStateKeyedServiceFactory {
  public:
   static SyncSetupService* GetForBrowserState(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
   static SyncSetupService* GetForBrowserStateIfExists(
-      ios::ChromeBrowserState* browser_state);
+      ChromeBrowserState* browser_state);
 
   static SyncSetupServiceFactory* GetInstance();