Commit 2318d680 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Use chrome_browser_state_forward.h in /ios/chrome/browser/sync

Instead of forward declaring ChromeBrowserState in the ios
namespace, use a header. This will allow moving the class
to the global namespace without having to change all the
forward declaration at the same time.

This CL was uploaded by git cl split.

R=mastiz@chromium.org

Bug: 1042208
Change-Id: If00ecce091d5f71b8d55e7197d71b5ed75e70727
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007641
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarMikel Astiz <mastiz@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733537}
parent f637d465
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
namespace base { namespace base {
template <typename T> template <typename T>
...@@ -21,10 +22,6 @@ class DeviceInfoSyncService; ...@@ -21,10 +22,6 @@ class DeviceInfoSyncService;
class DeviceInfoTracker; class DeviceInfoTracker;
} // namespace syncer } // namespace syncer
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Singleton that owns all DeviceInfoSyncService and associates them with // Singleton that owns all DeviceInfoSyncService and associates them with
// ios::ChromeBrowserState. // ios::ChromeBrowserState.
class DeviceInfoSyncServiceFactory : public BrowserStateKeyedServiceFactory { class DeviceInfoSyncServiceFactory : public BrowserStateKeyedServiceFactory {
......
...@@ -12,15 +12,12 @@ ...@@ -12,15 +12,12 @@
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "components/browser_sync/browser_sync_client.h" #include "components/browser_sync/browser_sync_client.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
namespace autofill { namespace autofill {
class AutofillWebDataService; class AutofillWebDataService;
} }
namespace ios {
class ChromeBrowserState;
}
namespace password_manager { namespace password_manager {
class PasswordStore; class PasswordStore;
} }
......
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
namespace syncer { namespace syncer {
class UserEventService; class UserEventService;
......
...@@ -10,15 +10,12 @@ ...@@ -10,15 +10,12 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
namespace syncer { namespace syncer {
class ModelTypeStoreService; class ModelTypeStoreService;
} // namespace syncer } // namespace syncer
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Singleton that owns all ModelTypeStoreService and associates them with // Singleton that owns all ModelTypeStoreService and associates them with
// ios::ChromeBrowserState. // ios::ChromeBrowserState.
class ModelTypeStoreServiceFactory : public BrowserStateKeyedServiceFactory { class ModelTypeStoreServiceFactory : public BrowserStateKeyedServiceFactory {
......
...@@ -10,16 +10,13 @@ ...@@ -10,16 +10,13 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
namespace syncer { namespace syncer {
class ProfileSyncService; class ProfileSyncService;
class SyncService; class SyncService;
} // namespace syncer } // namespace syncer
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Singleton that owns all SyncServices and associates them with // Singleton that owns all SyncServices and associates them with
// ios::ChromeBrowserState. // ios::ChromeBrowserState.
class ProfileSyncServiceFactory : public BrowserStateKeyedServiceFactory { class ProfileSyncServiceFactory : public BrowserStateKeyedServiceFactory {
......
...@@ -10,15 +10,12 @@ ...@@ -10,15 +10,12 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
namespace send_tab_to_self { namespace send_tab_to_self {
class SendTabToSelfSyncService; class SendTabToSelfSyncService;
} // namespace send_tab_to_self } // namespace send_tab_to_self
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Singleton that owns all SendTabToSelfSyncService and associates them with // Singleton that owns all SendTabToSelfSyncService and associates them with
// ios::ChromeBrowserState. // ios::ChromeBrowserState.
class SendTabToSelfSyncServiceFactory : public BrowserStateKeyedServiceFactory { class SendTabToSelfSyncServiceFactory : public BrowserStateKeyedServiceFactory {
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class GURL; class GURL;
...@@ -17,10 +18,6 @@ namespace sync_sessions { ...@@ -17,10 +18,6 @@ namespace sync_sessions {
class SessionSyncService; class SessionSyncService;
} // namespace sync_sessions } // namespace sync_sessions
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Singleton that owns all SessionSyncService and associates them with // Singleton that owns all SessionSyncService and associates them with
// ios::ChromeBrowserState. // ios::ChromeBrowserState.
class SessionSyncServiceFactory : public BrowserStateKeyedServiceFactory { class SessionSyncServiceFactory : public BrowserStateKeyedServiceFactory {
......
...@@ -14,16 +14,13 @@ ...@@ -14,16 +14,13 @@
#include "base/macros.h" #include "base/macros.h"
#include "components/sync/model/syncable_service.h" #include "components/sync/model/syncable_service.h"
#include "components/sync_sessions/local_session_event_router.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" #import "ios/chrome/browser/tabs/tab_model_list_observer.h"
#include "ios/chrome/browser/web_state_list/web_state_list_observer.h" #include "ios/chrome/browser/web_state_list/web_state_list_observer.h"
#include "ios/web/public/web_state_observer.h" #include "ios/web/public/web_state_observer.h"
class GURL; class GURL;
namespace ios {
class ChromeBrowserState;
}
namespace sync_sessions { namespace sync_sessions {
class SyncSessionsClient; class SyncSessionsClient;
} }
......
...@@ -10,13 +10,10 @@ ...@@ -10,13 +10,10 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class SyncSetupService; class SyncSetupService;
namespace ios {
class ChromeBrowserState;
}
// Singleton that owns all SyncSetupServices and associates them with // Singleton that owns all SyncSetupServices and associates them with
// BrowserStates. // BrowserStates.
class SyncSetupServiceFactory : public BrowserStateKeyedServiceFactory { class SyncSetupServiceFactory : public BrowserStateKeyedServiceFactory {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment