Index: sync/sessions/model_type_registry_unittest.cc |
diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc |
index 74967ac4376de070a4ef42579514a9f79e89b5cd..547b20a2f746538f6827ff1d2f082c7ede01e2c7 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( |