diff options
Diffstat (limited to 'sync/sessions')
-rw-r--r-- | sync/sessions/model_type_registry.cc | 30 | ||||
-rw-r--r-- | sync/sessions/model_type_registry.h | 4 | ||||
-rw-r--r-- | sync/sessions/model_type_registry_unittest.cc | 20 |
3 files changed, 27 insertions, 27 deletions
diff --git a/sync/sessions/model_type_registry.cc b/sync/sessions/model_type_registry.cc index 426288e..c2ed554 100644 --- a/sync/sessions/model_type_registry.cc +++ b/sync/sessions/model_type_registry.cc @@ -11,7 +11,7 @@ #include "sync/engine/directory_commit_contributor.h" #include "sync/engine/directory_update_handler.h" #include "sync/engine/model_type_processor.h" -#include "sync/engine/model_type_sync_proxy_impl.h" +#include "sync/engine/model_type_processor_impl.h" #include "sync/engine/model_type_sync_worker_impl.h" #include "sync/internal_api/public/non_blocking_sync_common.h" #include "sync/sessions/directory_type_debug_info_emitter.h" @@ -24,7 +24,7 @@ namespace { class ModelTypeSyncProxyWrapper : public syncer_v2::ModelTypeProcessor { public: ModelTypeSyncProxyWrapper( - const base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl>& proxy, + const base::WeakPtr<syncer_v2::ModelTypeProcessorImpl>& processor, const scoped_refptr<base::SequencedTaskRunner>& processor_task_runner); ~ModelTypeSyncProxyWrapper() override; @@ -37,14 +37,14 @@ class ModelTypeSyncProxyWrapper : public syncer_v2::ModelTypeProcessor { const syncer_v2::UpdateResponseDataList& pending_updates) override; private: - base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl> processor_; + base::WeakPtr<syncer_v2::ModelTypeProcessorImpl> processor_; scoped_refptr<base::SequencedTaskRunner> processor_task_runner_; }; ModelTypeSyncProxyWrapper::ModelTypeSyncProxyWrapper( - const base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl>& proxy, + const base::WeakPtr<syncer_v2::ModelTypeProcessorImpl>& processor, const scoped_refptr<base::SequencedTaskRunner>& processor_task_runner) - : processor_(proxy), processor_task_runner_(processor_task_runner) {} + : processor_(processor), processor_task_runner_(processor_task_runner) {} ModelTypeSyncProxyWrapper::~ModelTypeSyncProxyWrapper() { } @@ -54,7 +54,7 @@ void ModelTypeSyncProxyWrapper::OnCommitCompleted( const syncer_v2::CommitResponseDataList& response_list) { processor_task_runner_->PostTask( FROM_HERE, - base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::OnCommitCompleted, + base::Bind(&syncer_v2::ModelTypeProcessorImpl::OnCommitCompleted, processor_, type_state, response_list)); } @@ -64,7 +64,7 @@ void ModelTypeSyncProxyWrapper::OnUpdateReceived( const syncer_v2::UpdateResponseDataList& pending_updates) { processor_task_runner_->PostTask( FROM_HERE, - base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::OnUpdateReceived, + base::Bind(&syncer_v2::ModelTypeProcessorImpl::OnUpdateReceived, processor_, type_state, response_list, pending_updates)); } @@ -186,12 +186,12 @@ void ModelTypeRegistry::ConnectSyncTypeToWorker( const syncer_v2::DataTypeState& data_type_state, const syncer_v2::UpdateResponseDataList& saved_pending_updates, const scoped_refptr<base::SequencedTaskRunner>& type_task_runner, - const base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl>& proxy_impl) { + const base::WeakPtr<syncer_v2::ModelTypeProcessorImpl>& processor_impl) { DVLOG(1) << "Enabling an off-thread sync type: " << ModelTypeToString(type); - // Initialize Worker -> Proxy communication channel. - scoped_ptr<syncer_v2::ModelTypeProcessor> proxy( - new ModelTypeSyncProxyWrapper(proxy_impl, type_task_runner)); + // Initialize Worker -> Processor communication channel. + scoped_ptr<syncer_v2::ModelTypeProcessor> processor( + new ModelTypeSyncProxyWrapper(processor_impl, type_task_runner)); scoped_ptr<Cryptographer> cryptographer_copy; if (encrypted_types_.Has(type)) cryptographer_copy.reset(new Cryptographer(*cryptographer_)); @@ -199,16 +199,16 @@ void ModelTypeRegistry::ConnectSyncTypeToWorker( scoped_ptr<syncer_v2::ModelTypeSyncWorkerImpl> worker( new syncer_v2::ModelTypeSyncWorkerImpl( type, data_type_state, saved_pending_updates, - cryptographer_copy.Pass(), nudge_handler_, proxy.Pass())); + cryptographer_copy.Pass(), nudge_handler_, processor.Pass())); - // Initialize Proxy -> Worker communication channel. + // Initialize Processor -> Worker communication channel. scoped_ptr<syncer_v2::CommitQueue> wrapped_worker( new ModelTypeSyncWorkerWrapper(worker->AsWeakPtr(), scoped_refptr<base::SequencedTaskRunner>( base::ThreadTaskRunnerHandle::Get()))); type_task_runner->PostTask( - FROM_HERE, base::Bind(&syncer_v2::ModelTypeSyncProxyImpl::OnConnect, - proxy_impl, base::Passed(&wrapped_worker))); + FROM_HERE, base::Bind(&syncer_v2::ModelTypeProcessorImpl::OnConnect, + processor_impl, base::Passed(&wrapped_worker))); DCHECK(update_handler_map_.find(type) == update_handler_map_.end()); DCHECK(commit_contributor_map_.find(type) == commit_contributor_map_.end()); diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h index 3e04b79..868b3c2 100644 --- a/sync/sessions/model_type_registry.h +++ b/sync/sessions/model_type_registry.h @@ -23,7 +23,7 @@ namespace syncer_v2 { struct DataTypeState; class ModelTypeSyncWorkerImpl; -class ModelTypeSyncProxyImpl; +class ModelTypeProcessorImpl; } namespace syncer { @@ -66,7 +66,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry const syncer_v2::DataTypeState& data_type_state, const syncer_v2::UpdateResponseDataList& saved_pending_updates, const scoped_refptr<base::SequencedTaskRunner>& type_task_runner, - const base::WeakPtr<syncer_v2::ModelTypeSyncProxyImpl>& proxy) override; + const base::WeakPtr<syncer_v2::ModelTypeProcessorImpl>& proxy) override; // Disables the syncing of an off-thread type. // diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc index a831e03..648a6a8 100644 --- a/sync/sessions/model_type_registry_unittest.cc +++ b/sync/sessions/model_type_registry_unittest.cc @@ -7,7 +7,7 @@ #include "base/deferred_sequenced_task_runner.h" #include "base/message_loop/message_loop.h" #include "base/thread_task_runner_handle.h" -#include "sync/engine/model_type_sync_proxy_impl.h" +#include "sync/engine/model_type_processor_impl.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/sessions/model_type_registry.h" #include "sync/test/engine/fake_model_worker.h" @@ -17,7 +17,7 @@ namespace syncer { -using syncer_v2::ModelTypeSyncProxyImpl; +using syncer_v2::ModelTypeProcessorImpl; class ModelTypeRegistryTest : public ::testing::Test { public: @@ -145,8 +145,8 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_OffAndOn) { } TEST_F(ModelTypeRegistryTest, NonBlockingTypes) { - ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES); - ModelTypeSyncProxyImpl sessions_sync_proxy(syncer::SESSIONS); + ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES); + ModelTypeProcessorImpl sessions_sync_proxy(syncer::SESSIONS); scoped_refptr<base::DeferredSequencedTaskRunner> task_runner = new base::DeferredSequencedTaskRunner( base::ThreadTaskRunnerHandle::Get()); @@ -176,8 +176,8 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypes) { } TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) { - ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES); - ModelTypeSyncProxyImpl sessions_sync_proxy(syncer::SESSIONS); + ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES); + ModelTypeProcessorImpl sessions_sync_proxy(syncer::SESSIONS); scoped_refptr<base::DeferredSequencedTaskRunner> task_runner = new base::DeferredSequencedTaskRunner( base::ThreadTaskRunnerHandle::Get()); @@ -224,10 +224,10 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) { } TEST_F(ModelTypeRegistryTest, DeletionOrdering) { - scoped_ptr<ModelTypeSyncProxyImpl> themes_sync_proxy( - new ModelTypeSyncProxyImpl(syncer::THEMES)); - scoped_ptr<ModelTypeSyncProxyImpl> sessions_sync_proxy( - new ModelTypeSyncProxyImpl(syncer::SESSIONS)); + scoped_ptr<ModelTypeProcessorImpl> themes_sync_proxy( + new ModelTypeProcessorImpl(syncer::THEMES)); + scoped_ptr<ModelTypeProcessorImpl> sessions_sync_proxy( + new ModelTypeProcessorImpl(syncer::SESSIONS)); scoped_refptr<base::DeferredSequencedTaskRunner> task_runner = new base::DeferredSequencedTaskRunner( base::ThreadTaskRunnerHandle::Get()); |