| Index: sync/internal_api/sync_manager_impl.h
|
| diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
|
| index 783822d4c95ee833f9ab0dc7044758de5ea2166d..1de63cef8775d71b486d9f922e89474f73fea681 100644
|
| --- a/sync/internal_api/sync_manager_impl.h
|
| +++ b/sync/internal_api/sync_manager_impl.h
|
| @@ -33,41 +33,41 @@ class SyncManagerImpl : public SyncManager {
|
| // SyncManager implementation.
|
| virtual bool Init(
|
| const FilePath& database_location,
|
| - const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
|
| + const WeakHandle<JsEventHandler>& event_handler,
|
| const std::string& sync_server_and_path,
|
| int sync_server_port,
|
| bool use_ssl,
|
| const scoped_refptr<base::TaskRunner>& blocking_task_runner,
|
| scoped_ptr<HttpPostProviderFactory> post_factory,
|
| - const syncer::ModelSafeRoutingInfo& model_safe_routing_info,
|
| - const std::vector<syncer::ModelSafeWorker*>& workers,
|
| - syncer::ExtensionsActivityMonitor* extensions_activity_monitor,
|
| + const ModelSafeRoutingInfo& model_safe_routing_info,
|
| + const std::vector<ModelSafeWorker*>& workers,
|
| + ExtensionsActivityMonitor* extensions_activity_monitor,
|
| SyncManager::ChangeDelegate* change_delegate,
|
| const SyncCredentials& credentials,
|
| - scoped_ptr<syncer::SyncNotifier> sync_notifier,
|
| + scoped_ptr<SyncNotifier> sync_notifier,
|
| const std::string& restored_key_for_bootstrapping,
|
| TestingMode testing_mode,
|
| - syncer::Encryptor* encryptor,
|
| - syncer::UnrecoverableErrorHandler* unrecoverable_error_handler,
|
| - syncer::ReportUnrecoverableErrorFunction
|
| + Encryptor* encryptor,
|
| + UnrecoverableErrorHandler* unrecoverable_error_handler,
|
| + ReportUnrecoverableErrorFunction
|
| report_unrecoverable_error_function) OVERRIDE;
|
| virtual void ThrowUnrecoverableError() OVERRIDE;
|
| - virtual syncer::ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
|
| - virtual syncer::ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
|
| - syncer::ModelTypeSet types) OVERRIDE;
|
| + virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
|
| + virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
|
| + ModelTypeSet types) OVERRIDE;
|
| virtual bool PurgePartiallySyncedTypes() OVERRIDE;
|
| virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE;
|
| virtual void UpdateEnabledTypes(
|
| - const syncer::ModelTypeSet& enabled_types) OVERRIDE;
|
| + const ModelTypeSet& enabled_types) OVERRIDE;
|
| virtual void StartSyncingNormally(
|
| - const syncer::ModelSafeRoutingInfo& routing_info) OVERRIDE;
|
| + const ModelSafeRoutingInfo& routing_info) OVERRIDE;
|
| virtual void SetEncryptionPassphrase(const std::string& passphrase,
|
| bool is_explicit) OVERRIDE;
|
| virtual void SetDecryptionPassphrase(const std::string& passphrase) OVERRIDE;
|
| virtual void ConfigureSyncer(
|
| ConfigureReason reason,
|
| - const syncer::ModelTypeSet& types_to_config,
|
| - const syncer::ModelSafeRoutingInfo& new_routing_info,
|
| + const ModelTypeSet& types_to_config,
|
| + const ModelSafeRoutingInfo& new_routing_info,
|
| const base::Closure& ready_task,
|
| const base::Closure& retry_task) OVERRIDE;
|
| virtual void AddObserver(Observer* observer) OVERRIDE;
|
| @@ -81,8 +81,7 @@ class SyncManagerImpl : public SyncManager {
|
| virtual void RefreshNigori(const std::string& chrome_version,
|
| const base::Closure& done_callback) OVERRIDE;
|
| virtual void EnableEncryptEverything() OVERRIDE;
|
| - virtual bool ReceivedExperiment(
|
| - syncer::Experiments* experiments) const OVERRIDE;
|
| + virtual bool ReceivedExperiment(Experiments* experiments) const OVERRIDE;
|
| virtual bool HasUnsyncedItems() const OVERRIDE;
|
|
|
| // Functions used for testing.
|
| @@ -93,11 +92,11 @@ class SyncManagerImpl : public SyncManager {
|
|
|
| // Gets the set of encrypted types from the cryptographer
|
| // Note: opens a transaction. May be called from any thread.
|
| - syncer::ModelTypeSet GetEncryptedDataTypesForTest() const;
|
| + ModelTypeSet GetEncryptedDataTypesForTest() const;
|
|
|
| void SimulateEnableNotificationsForTest();
|
| void SimulateDisableNotificationsForTest(int reason);
|
| - void TriggerOnIncomingNotificationForTest(syncer::ModelTypeSet model_types);
|
| + void TriggerOnIncomingNotificationForTest(ModelTypeSet model_types);
|
|
|
| static int GetDefaultNudgeDelay();
|
| static int GetPreferencesNudgeDelay();
|
| @@ -108,12 +107,11 @@ class SyncManagerImpl : public SyncManager {
|
| FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, OnNotificationStateChange);
|
| FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, OnIncomingNotification);
|
|
|
| - base::TimeDelta GetNudgeDelayTimeDelta(const syncer::ModelType& model_type);
|
| + base::TimeDelta GetNudgeDelayTimeDelta(const ModelType& model_type);
|
|
|
| // Set the internal scheduler for testing purposes.
|
| // TODO(sync): Use dependency injection instead. crbug.com/133061
|
| - void SetSyncSchedulerForTest(
|
| - scoped_ptr<syncer::SyncScheduler> scheduler);
|
| + void SetSyncSchedulerForTest(scoped_ptr<SyncScheduler> scheduler);
|
|
|
| base::ThreadChecker thread_checker_;
|
|
|
|
|