| Index: components/sync/core_impl/sync_manager_impl.cc
|
| diff --git a/components/sync/core_impl/sync_manager_impl.cc b/components/sync/core_impl/sync_manager_impl.cc
|
| index 949566f166c7b720660df51acc3b0ab719b05474..9e251ae7dbe14f1ffdf91a57eb34fad346bf7ed3 100644
|
| --- a/components/sync/core_impl/sync_manager_impl.cc
|
| +++ b/components/sync/core_impl/sync_manager_impl.cc
|
| @@ -785,17 +785,17 @@ void SyncManagerImpl::RequestNudgeForDataTypes(
|
| scheduler_->ScheduleLocalNudge(types, nudge_location);
|
| }
|
|
|
| -void SyncManagerImpl::NudgeForInitialDownload(syncer::ModelType type) {
|
| +void SyncManagerImpl::NudgeForInitialDownload(ModelType type) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| scheduler_->ScheduleInitialSyncNudge(type);
|
| }
|
|
|
| -void SyncManagerImpl::NudgeForCommit(syncer::ModelType type) {
|
| +void SyncManagerImpl::NudgeForCommit(ModelType type) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| RequestNudgeForDataTypes(FROM_HERE, ModelTypeSet(type));
|
| }
|
|
|
| -void SyncManagerImpl::NudgeForRefresh(syncer::ModelType type) {
|
| +void SyncManagerImpl::NudgeForRefresh(ModelType type) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| RefreshTypes(ModelTypeSet(type));
|
| }
|
| @@ -857,7 +857,7 @@ void SyncManagerImpl::SetInvalidatorEnabled(bool invalidator_enabled) {
|
| }
|
|
|
| void SyncManagerImpl::OnIncomingInvalidation(
|
| - syncer::ModelType type,
|
| + ModelType type,
|
| std::unique_ptr<InvalidationInterface> invalidation) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| @@ -888,10 +888,10 @@ UserShare* SyncManagerImpl::GetUserShare() {
|
| return &share_;
|
| }
|
|
|
| -std::unique_ptr<syncer_v2::ModelTypeConnector>
|
| +std::unique_ptr<ModelTypeConnector>
|
| SyncManagerImpl::GetModelTypeConnectorProxy() {
|
| DCHECK(initialized_);
|
| - return base::MakeUnique<syncer_v2::ModelTypeConnectorProxy>(
|
| + return base::MakeUnique<ModelTypeConnectorProxy>(
|
| base::ThreadTaskRunnerHandle::Get(), model_type_registry_->AsWeakPtr());
|
| }
|
|
|
| @@ -910,8 +910,8 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
|
| bool found_experiment = false;
|
|
|
| ReadNode favicon_sync_node(&trans);
|
| - if (favicon_sync_node.InitByClientTagLookup(
|
| - syncer::EXPERIMENTS, syncer::kFaviconSyncTag) == BaseNode::INIT_OK) {
|
| + if (favicon_sync_node.InitByClientTagLookup(EXPERIMENTS, kFaviconSyncTag) ==
|
| + BaseNode::INIT_OK) {
|
| experiments->favicon_sync_limit =
|
| favicon_sync_node.GetExperimentsSpecifics()
|
| .favicon_sync()
|
| @@ -921,8 +921,7 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
|
|
|
| ReadNode pre_commit_update_avoidance_node(&trans);
|
| if (pre_commit_update_avoidance_node.InitByClientTagLookup(
|
| - syncer::EXPERIMENTS, syncer::kPreCommitUpdateAvoidanceTag) ==
|
| - BaseNode::INIT_OK) {
|
| + EXPERIMENTS, kPreCommitUpdateAvoidanceTag) == BaseNode::INIT_OK) {
|
| cycle_context_->set_server_enabled_pre_commit_update_avoidance(
|
| pre_commit_update_avoidance_node.GetExperimentsSpecifics()
|
| .pre_commit_update_avoidance()
|
| @@ -933,8 +932,7 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
|
|
|
| ReadNode gcm_invalidations_node(&trans);
|
| if (gcm_invalidations_node.InitByClientTagLookup(
|
| - syncer::EXPERIMENTS, syncer::kGCMInvalidationsTag) ==
|
| - BaseNode::INIT_OK) {
|
| + EXPERIMENTS, kGCMInvalidationsTag) == BaseNode::INIT_OK) {
|
| const sync_pb::GcmInvalidationsFlags& gcm_invalidations =
|
| gcm_invalidations_node.GetExperimentsSpecifics().gcm_invalidations();
|
| if (gcm_invalidations.has_enabled()) {
|
| @@ -961,17 +959,17 @@ SyncManagerImpl::GetBufferedProtocolEvents() {
|
| }
|
|
|
| void SyncManagerImpl::RegisterDirectoryTypeDebugInfoObserver(
|
| - syncer::TypeDebugInfoObserver* observer) {
|
| + TypeDebugInfoObserver* observer) {
|
| model_type_registry_->RegisterDirectoryTypeDebugInfoObserver(observer);
|
| }
|
|
|
| void SyncManagerImpl::UnregisterDirectoryTypeDebugInfoObserver(
|
| - syncer::TypeDebugInfoObserver* observer) {
|
| + TypeDebugInfoObserver* observer) {
|
| model_type_registry_->UnregisterDirectoryTypeDebugInfoObserver(observer);
|
| }
|
|
|
| bool SyncManagerImpl::HasDirectoryTypeDebugInfoObserver(
|
| - syncer::TypeDebugInfoObserver* observer) {
|
| + TypeDebugInfoObserver* observer) {
|
| return model_type_registry_->HasDirectoryTypeDebugInfoObserver(observer);
|
| }
|
|
|
|
|