Device info datatype should be moved to components/sync_driver.

chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #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"
 #include "chrome/browser/sync/protocol_event_observer.h"
 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
 #include "chrome/browser/sync/startup_controller.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "components/sync_driver/data_type_encryption_handler.h"
 #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"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/base/backoff_entry.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/internal_api/public/shutdown_reason.h"
 #include "sync/internal_api/public/sync_manager_factory.h"
@@ skipping 20 matching lines @@
 class OpenTabsUIDelegate;
 
 namespace sessions {
 class SyncSessionSnapshot;
 }  // namespace sessions
 }  // namespace browser_sync
 
 namespace sync_driver {
 class ChangeProcessor;
 class DataTypeManager;
+class DeviceInfoSyncService;
+class LocalDeviceInfoProvider;
 }  // namespace sync_driver
 
 namespace syncer {
 class BaseTransaction;
 class NetworkResources;
 struct CommitCounters;
 struct StatusCounters;
 struct SyncCredentials;
 struct UpdateCounters;
 struct UserShare;
 }  // namespace syncer
 
 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.
 //
 // Individual datatypes can, at any point, be in a variety of stages of being
 // "enabled".  Here are some specific terms for concepts used in this class:
 //
 //   'Registered' (feature suppression for a datatype)
 //
 //      When a datatype is registered, the user has the option of syncing it.
@@ skipping 260 matching lines @@
   virtual browser_sync::SyncedWindowDelegatesGetter*
   GetSyncedWindowDelegatesGetter() const;
 
   // Returns the SyncableService for syncer::SESSIONS.
   virtual syncer::SyncableService* GetSessionsSyncableService();
 
   // Returns the SyncableService for syncer::DEVICE_INFO.
   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.
   void GetDataTypeControllerStates(
     sync_driver::DataTypeController::StateMap* state_map) const;
 
   // Disables sync for user. Use ShowLoginDialog to enable.
   virtual void DisableForUser();
 
   // Disables sync for the user and prevents it from starting on next restart.
@@ skipping 724 matching lines @@
   base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_;
 
   // States related to sync token and connection.
   base::Time connection_status_update_time_;
   syncer::ConnectionStatus connection_status_;
   base::Time token_request_time_;
   base::Time token_receive_time_;
   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_;
 
   browser_sync::StartupController startup_controller_;
 
   browser_sync::BackupRollbackController backup_rollback_controller_;
 
   // Mode of current backend.
   BackendMode backend_mode_;
 
@@ skipping 16 matching lines @@
   BrowsingDataRemover::Observer* browsing_data_remover_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const syncer::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_