| Index: components/sync_sessions/sessions_sync_manager.h
|
| diff --git a/components/sync_sessions/sessions_sync_manager.h b/components/sync_sessions/sessions_sync_manager.h
|
| index 360601ba5a93b6aa42406e2450c3cb8cd5004986..a0ff584d3f0bee4fa1444c12f0dcadf2cd7ca6df 100644
|
| --- a/components/sync_sessions/sessions_sync_manager.h
|
| +++ b/components/sync_sessions/sessions_sync_manager.h
|
| @@ -33,13 +33,10 @@
|
| #include "components/sync_sessions/tab_node_pool.h"
|
|
|
| namespace syncer {
|
| -class SyncErrorFactory;
|
| -}
|
| -
|
| -namespace sync_driver {
|
| class LocalDeviceInfoProvider;
|
| +class SyncErrorFactory;
|
| class SyncPrefs;
|
| -}
|
| +} // namespace syncer
|
|
|
| namespace sync_pb {
|
| class SessionHeader;
|
| @@ -65,8 +62,8 @@ class SessionsSyncManager : public syncer::SyncableService,
|
| public LocalSessionEventHandler {
|
| public:
|
| SessionsSyncManager(SyncSessionsClient* sessions_client,
|
| - sync_driver::SyncPrefs* sync_prefs,
|
| - sync_driver::LocalDeviceInfoProvider* local_device,
|
| + syncer::SyncPrefs* sync_prefs,
|
| + syncer::LocalDeviceInfoProvider* local_device,
|
| std::unique_ptr<LocalSessionEventRouter> router,
|
| const base::Closure& sessions_updated_callback,
|
| const base::Closure& datatype_refresh_callback);
|
| @@ -344,13 +341,13 @@ class SessionsSyncManager : public syncer::SyncableService,
|
| // proves that we are still relevant.
|
| bool local_tab_pool_out_of_sync_;
|
|
|
| - sync_driver::SyncPrefs* sync_prefs_;
|
| + syncer::SyncPrefs* sync_prefs_;
|
|
|
| std::unique_ptr<syncer::SyncErrorFactory> error_handler_;
|
| std::unique_ptr<syncer::SyncChangeProcessor> sync_processor_;
|
|
|
| // Local device info provider, owned by ProfileSyncService.
|
| - const sync_driver::LocalDeviceInfoProvider* const local_device_;
|
| + const syncer::LocalDeviceInfoProvider* const local_device_;
|
|
|
| // Unique client tag.
|
| std::string current_machine_tag_;
|
|
|