| Index: sync/internal_api/public/test/fake_sync_manager.h
|
| diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h
|
| index 9753927f110e800d3dd509947551ed8a607c2266..b0a5d1fea939a7b5ccbc139efa6ce16c9245d9b0 100644
|
| --- a/sync/internal_api/public/test/fake_sync_manager.h
|
| +++ b/sync/internal_api/public/test/fake_sync_manager.h
|
| @@ -23,68 +23,67 @@ class FakeSyncManager : public SyncManager {
|
| // The set of types that have initial_sync_ended set to true. This value will
|
| // be used by InitialSyncEndedTypes() until the next configuration is
|
| // performed.
|
| - void set_initial_sync_ended_types(syncer::ModelTypeSet types);
|
| + void set_initial_sync_ended_types(ModelTypeSet types);
|
|
|
| // The set of types that have valid progress markers. This will be used by
|
| // GetTypesWithEmptyProgressMarkerToken() until the next configuration is
|
| // performed.
|
| - void set_progress_marker_types(syncer::ModelTypeSet types);
|
| + void set_progress_marker_types(ModelTypeSet types);
|
|
|
| // The set of types that will fail configuration. Once ConfigureSyncer is
|
| // called, the |initial_sync_ended_types_| and
|
| // |progress_marker_types_| will be updated to include those types
|
| // that didn't fail.
|
| - void set_configure_fail_types(syncer::ModelTypeSet types);
|
| + void set_configure_fail_types(ModelTypeSet types);
|
|
|
| // Returns those types that have been cleaned (purged from the directory)
|
| // since the last call to GetAndResetCleanedTypes(), or since startup if never
|
| // called.
|
| - syncer::ModelTypeSet GetAndResetCleanedTypes();
|
| + ModelTypeSet GetAndResetCleanedTypes();
|
|
|
| // Returns those types that have been downloaded since the last call to
|
| // GetAndResetDownloadedTypes(), or since startup if never called.
|
| - syncer::ModelTypeSet GetAndResetDownloadedTypes();
|
| + ModelTypeSet GetAndResetDownloadedTypes();
|
|
|
| // SyncManager implementation.
|
| // Note: we treat whatever message loop this is called from as the sync
|
| // loop for purposes of callbacks.
|
| 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,
|
| ChangeDelegate* change_delegate,
|
| const SyncCredentials& credentials,
|
| - scoped_ptr<syncer::SyncNotifier> sync_notifier,
|
| + scoped_ptr<SyncNotifier> sync_notifier,
|
| const std::string& restored_key_for_bootstrapping,
|
| scoped_ptr<InternalComponentsFactory> internal_components_factory,
|
| - 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& types) OVERRIDE;
|
| + virtual void UpdateEnabledTypes(const ModelTypeSet& 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;
|
| @@ -98,24 +97,24 @@ class FakeSyncManager : 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) OVERRIDE;
|
| + virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE;
|
| virtual bool HasUnsyncedItems() OVERRIDE;
|
|
|
| private:
|
| ObserverList<SyncManager::Observer> observers_;
|
|
|
| // Faked directory state.
|
| - syncer::ModelTypeSet initial_sync_ended_types_;
|
| - syncer::ModelTypeSet progress_marker_types_;
|
| + ModelTypeSet initial_sync_ended_types_;
|
| + ModelTypeSet progress_marker_types_;
|
|
|
| // Test specific state.
|
| // The types that should fail configuration attempts. These types will not
|
| // have their progress markers or initial_sync_ended bits set.
|
| - syncer::ModelTypeSet configure_fail_types_;
|
| + ModelTypeSet configure_fail_types_;
|
| // The set of types that have been cleaned up.
|
| - syncer::ModelTypeSet cleaned_types_;
|
| + ModelTypeSet cleaned_types_;
|
| // The set of types that have been downloaded.
|
| - syncer::ModelTypeSet downloaded_types_;
|
| + ModelTypeSet downloaded_types_;
|
|
|
| // For StopSyncingForShutdown's callback.
|
| MessageLoop* sync_loop_;
|
|
|