Index: components/sync/driver/glue/sync_backend_host_mock.cc |
diff --git a/components/sync/driver/glue/sync_backend_host_mock.cc b/components/sync/driver/glue/sync_backend_host_mock.cc |
index 384c5174c442bfa6576c18dc0893acd06d938e59..7a8b65485a02f19bfd9c3d60b1f9a7320d3a2a97 100644 |
--- a/components/sync/driver/glue/sync_backend_host_mock.cc |
+++ b/components/sync/driver/glue/sync_backend_host_mock.cc |
@@ -7,7 +7,7 @@ |
#include "components/sync/core/activation_context.h" |
#include "components/sync/driver/sync_frontend.h" |
-namespace syncer { |
+namespace browser_sync { |
const char kTestCacheGuid[] = "test-guid"; |
@@ -15,29 +15,32 @@ SyncBackendHostMock::SyncBackendHostMock() : fail_initial_download_(false) {} |
SyncBackendHostMock::~SyncBackendHostMock() {} |
void SyncBackendHostMock::Initialize( |
- SyncFrontend* frontend, |
+ sync_driver::SyncFrontend* frontend, |
std::unique_ptr<base::Thread> sync_thread, |
const scoped_refptr<base::SingleThreadTaskRunner>& db_thread, |
const scoped_refptr<base::SingleThreadTaskRunner>& file_thread, |
- const WeakHandle<JsEventHandler>& event_handler, |
+ const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, |
const GURL& service_url, |
const std::string& sync_user_agent, |
- const SyncCredentials& credentials, |
+ const syncer::SyncCredentials& credentials, |
bool delete_sync_data_folder, |
- std::unique_ptr<SyncManagerFactory> sync_manager_factory, |
- const WeakHandle<UnrecoverableErrorHandler>& unrecoverable_error_handler, |
+ std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory, |
+ const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>& |
+ unrecoverable_error_handler, |
const base::Closure& report_unrecoverable_error_function, |
const HttpPostProviderFactoryGetter& http_post_provider_factory_getter, |
- std::unique_ptr<SyncEncryptionHandler::NigoriState> saved_nigori_state) { |
- frontend->OnBackendInitialized(WeakHandle<JsBackend>(), |
- WeakHandle<DataTypeDebugInfoListener>(), |
- kTestCacheGuid, !fail_initial_download_); |
+ std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> |
+ saved_nigori_state) { |
+ frontend->OnBackendInitialized( |
+ syncer::WeakHandle<syncer::JsBackend>(), |
+ syncer::WeakHandle<syncer::DataTypeDebugInfoListener>(), kTestCacheGuid, |
+ !fail_initial_download_); |
} |
-void SyncBackendHostMock::TriggerRefresh(const ModelTypeSet& types) {} |
+void SyncBackendHostMock::TriggerRefresh(const syncer::ModelTypeSet& types) {} |
void SyncBackendHostMock::UpdateCredentials( |
- const SyncCredentials& credentials) {} |
+ const syncer::SyncCredentials& credentials) {} |
void SyncBackendHostMock::StartSyncingWithServer() {} |
@@ -52,35 +55,37 @@ bool SyncBackendHostMock::SetDecryptionPassphrase( |
void SyncBackendHostMock::StopSyncingForShutdown() {} |
std::unique_ptr<base::Thread> SyncBackendHostMock::Shutdown( |
- ShutdownReason reason) { |
+ syncer::ShutdownReason reason) { |
return std::unique_ptr<base::Thread>(); |
} |
void SyncBackendHostMock::UnregisterInvalidationIds() {} |
-ModelTypeSet SyncBackendHostMock::ConfigureDataTypes( |
- ConfigureReason reason, |
+syncer::ModelTypeSet SyncBackendHostMock::ConfigureDataTypes( |
+ syncer::ConfigureReason reason, |
const DataTypeConfigStateMap& config_state_map, |
- const base::Callback<void(ModelTypeSet, ModelTypeSet)>& ready_task, |
+ const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>& |
+ ready_task, |
const base::Callback<void()>& retry_callback) { |
- return ModelTypeSet(); |
+ return syncer::ModelTypeSet(); |
} |
void SyncBackendHostMock::EnableEncryptEverything() {} |
void SyncBackendHostMock::ActivateDirectoryDataType( |
- ModelType type, |
- ModelSafeGroup group, |
- ChangeProcessor* change_processor) {} |
-void SyncBackendHostMock::DeactivateDirectoryDataType(ModelType type) {} |
+ syncer::ModelType type, |
+ syncer::ModelSafeGroup group, |
+ sync_driver::ChangeProcessor* change_processor) {} |
+void SyncBackendHostMock::DeactivateDirectoryDataType(syncer::ModelType type) {} |
void SyncBackendHostMock::ActivateNonBlockingDataType( |
- ModelType type, |
- std::unique_ptr<ActivationContext> activation_context) {} |
+ syncer::ModelType type, |
+ std::unique_ptr<syncer_v2::ActivationContext> activation_context) {} |
-void SyncBackendHostMock::DeactivateNonBlockingDataType(ModelType type) {} |
+void SyncBackendHostMock::DeactivateNonBlockingDataType( |
+ syncer::ModelType type) {} |
-UserShare* SyncBackendHostMock::GetUserShare() const { |
+syncer::UserShare* SyncBackendHostMock::GetUserShare() const { |
return NULL; |
} |
@@ -88,8 +93,8 @@ SyncBackendHost::Status SyncBackendHostMock::GetDetailedStatus() { |
return SyncBackendHost::Status(); |
} |
-SyncCycleSnapshot SyncBackendHostMock::GetLastCycleSnapshot() const { |
- return SyncCycleSnapshot(); |
+syncer::SyncCycleSnapshot SyncBackendHostMock::GetLastCycleSnapshot() const { |
+ return syncer::SyncCycleSnapshot(); |
} |
bool SyncBackendHostMock::HasUnsyncedItems() const { |
@@ -100,8 +105,8 @@ bool SyncBackendHostMock::IsNigoriEnabled() const { |
return true; |
} |
-PassphraseType SyncBackendHostMock::GetPassphraseType() const { |
- return PassphraseType::IMPLICIT_PASSPHRASE; |
+syncer::PassphraseType SyncBackendHostMock::GetPassphraseType() const { |
+ return syncer::PassphraseType::IMPLICIT_PASSPHRASE; |
} |
base::Time SyncBackendHostMock::GetExplicitPassphraseTime() const { |
@@ -109,12 +114,12 @@ base::Time SyncBackendHostMock::GetExplicitPassphraseTime() const { |
} |
bool SyncBackendHostMock::IsCryptographerReady( |
- const BaseTransaction* trans) const { |
+ const syncer::BaseTransaction* trans) const { |
return false; |
} |
void SyncBackendHostMock::GetModelSafeRoutingInfo( |
- ModelSafeRoutingInfo* out) const {} |
+ syncer::ModelSafeRoutingInfo* out) const {} |
void SyncBackendHostMock::FlushDirectory() const {} |
@@ -122,7 +127,7 @@ base::MessageLoop* SyncBackendHostMock::GetSyncLoopForTesting() { |
return NULL; |
} |
-void SyncBackendHostMock::RefreshTypesForTest(ModelTypeSet types) {} |
+void SyncBackendHostMock::RefreshTypesForTest(syncer::ModelTypeSet types) {} |
void SyncBackendHostMock::RequestBufferedProtocolEventsAndEnableForwarding() {} |
@@ -137,11 +142,11 @@ void SyncBackendHostMock::set_fail_initial_download(bool should_fail) { |
} |
void SyncBackendHostMock::ClearServerData( |
- const SyncManager::ClearServerDataCallback& callback) { |
+ const syncer::SyncManager::ClearServerDataCallback& callback) { |
callback.Run(); |
} |
void SyncBackendHostMock::OnCookieJarChanged(bool account_mismatch, |
bool empty_jar) {} |
-} // namespace syncer |
+} // namespace browser_sync |