1 files changed, 9 insertions, 11 deletions
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 4d88648..ac43cf8 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -23,8 +23,6 @@
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/sync/backend_unrecoverable_error_handler.h"
 #include "chrome/browser/sync/backup_rollback_controller.h"
-#include "chrome/browser/sync/glue/device_info_sync_service.h"
-#include "chrome/browser/sync/glue/local_device_info_provider.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/profile_sync_service_base.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
@@ -38,6 +36,8 @@
 #include "components/sync_driver/data_type_manager.h"
 #include "components/sync_driver/data_type_manager_observer.h"
 #include "components/sync_driver/data_type_status_table.h"
+#include "components/sync_driver/device_info_sync_service.h"
+#include "components/sync_driver/local_device_info_provider.h"
 #include "components/sync_driver/non_blocking_data_type_manager.h"
 #include "components/sync_driver/sync_frontend.h"
 #include "components/sync_driver/sync_prefs.h"
@@ -78,6 +78,8 @@ class SyncSessionSnapshot;
 namespace sync_driver {
 class ChangeProcessor;
 class DataTypeManager;
+class DeviceInfoSyncService;
+class LocalDeviceInfoProvider;
 }  // namespace sync_driver
 
 namespace syncer {
@@ -94,10 +96,6 @@ namespace sync_pb {
 class EncryptedData;
 }  // namespace sync_pb
 
-using browser_sync::DeviceInfoSyncService;
-using browser_sync::LocalDeviceInfoProvider;
-using browser_sync::SessionsSyncManager;
-
 // ProfileSyncService is the layer between browser subsystems like bookmarks,
 // and the sync backend.  Each subsystem is logically thought of as being
 // a sync datatype.
@@ -378,11 +376,11 @@ class ProfileSyncService : public ProfileSyncServiceBase,
   virtual syncer::SyncableService* GetDeviceInfoSyncableService();
 
   // Returns DeviceInfo provider for the local device.
-  virtual browser_sync::LocalDeviceInfoProvider* GetLocalDeviceInfoProvider();
+  virtual sync_driver::LocalDeviceInfoProvider* GetLocalDeviceInfoProvider();
 
   // Returns synced devices tracker. If DEVICE_INFO model type isn't yet
   // enabled or syncing, returns NULL.
-  virtual browser_sync::DeviceInfoTracker* GetDeviceInfoTracker() const;
+  virtual sync_driver::DeviceInfoTracker* GetDeviceInfoTracker() const;
 
   // Fills state_map with a map of current data types that are possible to
   // sync, as well as their states.
@@ -1127,11 +1125,11 @@ class ProfileSyncService : public ProfileSyncServiceBase,
   GoogleServiceAuthError last_get_token_error_;
   base::Time next_token_request_time_;
 
-  scoped_ptr<LocalDeviceInfoProvider> local_device_;
+  scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device_;
 
   // Locally owned SyncableService implementations.
-  scoped_ptr<SessionsSyncManager> sessions_sync_manager_;
-  scoped_ptr<DeviceInfoSyncService> device_info_sync_service_;
+  scoped_ptr<browser_sync::SessionsSyncManager> sessions_sync_manager_;
+  scoped_ptr<sync_driver::DeviceInfoSyncService> device_info_sync_service_;
 
   scoped_ptr<syncer::NetworkResources> network_resources_;