diff options
| author | maxbogue <maxbogue@chromium.org> | 2015-10-09 10:42:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-09 17:43:56 +0000 |
| commit | 786b459e828e3d593d92ccd8f1b53dee26cbe052 (patch) | |
| tree | cf0b56aa3954d75a926655d94af8919aa871903c /sync/sessions | |
| parent | 18930bdc3e8f077a3508121b0ce4e34386878db2 (diff) | |
| download | chromium_src-786b459e828e3d593d92ccd8f1b53dee26cbe052.zip chromium_src-786b459e828e3d593d92ccd8f1b53dee26cbe052.tar.gz chromium_src-786b459e828e3d593d92ccd8f1b53dee26cbe052.tar.bz2 | |
[Sync] Move ModelTypeProcessor* and rename *Impl to Shared*.
BUG=536895
Review URL: https://codereview.chromium.org/1382743004
Cr-Commit-Position: refs/heads/master@{#353323}
Diffstat (limited to 'sync/sessions')
| -rw-r--r-- | sync/sessions/model_type_registry.cc | 3 | ||||
| -rw-r--r-- | sync/sessions/model_type_registry_unittest.cc | 18 |
2 files changed, 10 insertions, 11 deletions
diff --git a/sync/sessions/model_type_registry.cc b/sync/sessions/model_type_registry.cc index 9c1609a..3e2fa0a 100644 --- a/sync/sessions/model_type_registry.cc +++ b/sync/sessions/model_type_registry.cc @@ -10,10 +10,9 @@ #include "sync/engine/commit_queue.h" #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_processor_impl.h" #include "sync/engine/model_type_worker.h" #include "sync/internal_api/public/activation_context.h" +#include "sync/internal_api/public/model_type_processor.h" #include "sync/sessions/directory_type_debug_info_emitter.h" #include "sync/util/cryptographer.h" diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc index 74967ac..547b20a 100644 --- a/sync/sessions/model_type_registry_unittest.cc +++ b/sync/sessions/model_type_registry_unittest.cc @@ -7,9 +7,9 @@ #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_processor_impl.h" #include "sync/internal_api/public/activation_context.h" #include "sync/internal_api/public/base/model_type.h" +#include "sync/internal_api/public/shared_model_type_processor.h" #include "sync/sessions/model_type_registry.h" #include "sync/test/engine/fake_model_worker.h" #include "sync/test/engine/mock_nudge_handler.h" @@ -158,9 +158,9 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_OffAndOn) { } TEST_F(ModelTypeRegistryTest, NonBlockingTypes) { - syncer_v2::ModelTypeProcessorImpl themes_sync_proxy( + syncer_v2::SharedModelTypeProcessor themes_sync_proxy( syncer::THEMES, base::WeakPtr<syncer_v2::ModelTypeStore>()); - syncer_v2::ModelTypeProcessorImpl sessions_sync_proxy( + syncer_v2::SharedModelTypeProcessor sessions_sync_proxy( syncer::SESSIONS, base::WeakPtr<syncer_v2::ModelTypeStore>()); scoped_refptr<base::DeferredSequencedTaskRunner> task_runner = new base::DeferredSequencedTaskRunner( @@ -193,9 +193,9 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypes) { } TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) { - syncer_v2::ModelTypeProcessorImpl themes_sync_proxy( + syncer_v2::SharedModelTypeProcessor themes_sync_proxy( syncer::THEMES, base::WeakPtr<syncer_v2::ModelTypeStore>()); - syncer_v2::ModelTypeProcessorImpl sessions_sync_proxy( + syncer_v2::SharedModelTypeProcessor sessions_sync_proxy( syncer::SESSIONS, base::WeakPtr<syncer_v2::ModelTypeStore>()); scoped_refptr<base::DeferredSequencedTaskRunner> task_runner = new base::DeferredSequencedTaskRunner( @@ -245,11 +245,11 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) { } TEST_F(ModelTypeRegistryTest, DeletionOrdering) { - scoped_ptr<syncer_v2::ModelTypeProcessorImpl> themes_sync_proxy( - new syncer_v2::ModelTypeProcessorImpl( + scoped_ptr<syncer_v2::SharedModelTypeProcessor> themes_sync_proxy( + new syncer_v2::SharedModelTypeProcessor( syncer::THEMES, base::WeakPtr<syncer_v2::ModelTypeStore>())); - scoped_ptr<syncer_v2::ModelTypeProcessorImpl> sessions_sync_proxy( - new syncer_v2::ModelTypeProcessorImpl( + scoped_ptr<syncer_v2::SharedModelTypeProcessor> sessions_sync_proxy( + new syncer_v2::SharedModelTypeProcessor( syncer::SESSIONS, base::WeakPtr<syncer_v2::ModelTypeStore>())); scoped_refptr<base::DeferredSequencedTaskRunner> task_runner = new base::DeferredSequencedTaskRunner( |