Refactor syncable DEVICE_INFO type from ChangeProcessor to SyncableService - part 3.

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/glue/synced_device_tracker.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"
@@ skipping 20 matching lines @@
 class SupervisedUserSigninManagerWrapper;
 class SyncErrorController;
 class SyncTypePreferenceProvider;
 
 namespace base {
 class CommandLine;
 };
 
 namespace browser_sync {
 class BackendMigrator;
-class DeviceInfo;
 class FaviconCache;
 class JsController;
 class OpenTabsUIDelegate;
 
 namespace sessions {
 class SyncSessionSnapshot;
 }  // namespace sessions
 }  // namespace browser_sync
 
 namespace sync_driver {
 class ChangeProcessor;
 class DataTypeManager;
 }  // 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:
 //
@@ skipping 259 matching lines @@
   // currently syncing, returns NULL.
   virtual browser_sync::OpenTabsUIDelegate* GetOpenTabsUIDelegate();
 
   // Returns the SyncedWindowDelegatesGetter from the embedded sessions manager.
   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();
 
-  // Returns sync's representation of the device info for a client identified
-  // by |client_id|. Return value is an empty scoped ptr if the device info
-  // is unavailable.
-  virtual scoped_ptr<browser_sync::DeviceInfo> GetDeviceInfo(
-      const std::string& client_id) const;
-
-  // Gets the device info for all devices signed into the account associated
-  // with this profile.
-  virtual ScopedVector<browser_sync::DeviceInfo> GetAllSignedInDevices() const;
-
-  // Notifies the observer of any device info changes.
-  virtual void AddObserverForDeviceInfoChange(
-      browser_sync::SyncedDeviceTracker::Observer* observer);
-
-  // Removes the observer from device info notification.
-  virtual void RemoveObserverForDeviceInfoChange(
-      browser_sync::SyncedDeviceTracker::Observer* observer);
+  // Returns synced devices tracker. If DEVICE_INFO model type isn't yet
+  // enabled or syncing, returns NULL.
+  virtual browser_sync::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 362 matching lines @@
   // Return sync token status.
   SyncTokenStatus GetSyncTokenStatus() const;
 
   browser_sync::FaviconCache* GetFaviconCache();
 
   // Overrides the NetworkResources used for Sync connections.
   // This function takes ownership of |network_resources|.
   void OverrideNetworkResourcesForTest(
       scoped_ptr<syncer::NetworkResources> network_resources);
 
-  virtual bool IsSessionsDataTypeControllerRunning() const;
+  virtual bool IsDataTypeControllerRunning(syncer::ModelType type) const;
 
   BackendMode backend_mode() const {
     return backend_mode_;
   }
 
   // Helpers for testing rollback.
   void SetBrowsingDataRemoverObserverForTesting(
       BrowsingDataRemover::Observer* observer);
   void SetClearingBrowseringDataForTesting(base::Callback<
       void(BrowsingDataRemover::Observer*, Profile*, base::Time, base::Time)>
@@ skipping 345 matching lines @@
   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_;
 
   // Locally owned SyncableService implementations.
   scoped_ptr<SessionsSyncManager> sessions_sync_manager_;
+  scoped_ptr<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_