Index: sync/internal_api/sync_context_proxy_impl_unittest.cc |
diff --git a/sync/internal_api/sync_context_proxy_impl_unittest.cc b/sync/internal_api/sync_context_proxy_impl_unittest.cc |
index f4981d7d386e663193fe9938c4438e11526754c9..b280adc56f81215fb64eff06ce046664a9613b52 100644 |
--- a/sync/internal_api/sync_context_proxy_impl_unittest.cc |
+++ b/sync/internal_api/sync_context_proxy_impl_unittest.cc |
@@ -6,8 +6,8 @@ |
#include "base/run_loop.h" |
#include "base/sequenced_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
-#include "sync/engine/model_type_processor_impl.h" |
#include "sync/internal_api/public/base/model_type.h" |
+#include "sync/internal_api/public/shared_model_type_processor.h" |
#include "sync/internal_api/public/sync_context.h" |
#include "sync/internal_api/sync_context_proxy_impl.h" |
#include "sync/sessions/model_type_registry.h" |
@@ -58,8 +58,8 @@ class SyncContextProxyImplTest : public ::testing::Test { |
// Try to connect a type to a SyncContext that has already shut down. |
TEST_F(SyncContextProxyImplTest, FailToConnect1) { |
- ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES, |
- base::WeakPtr<ModelTypeStore>()); |
+ SharedModelTypeProcessor themes_sync_proxy(syncer::THEMES, |
+ base::WeakPtr<ModelTypeStore>()); |
DisableSync(); |
themes_sync_proxy.Enable(GetProxy()); |
@@ -70,8 +70,8 @@ TEST_F(SyncContextProxyImplTest, FailToConnect1) { |
// Try to connect a type to a SyncContext as it shuts down. |
TEST_F(SyncContextProxyImplTest, FailToConnect2) { |
- ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES, |
- base::WeakPtr<ModelTypeStore>()); |
+ SharedModelTypeProcessor themes_sync_proxy(syncer::THEMES, |
+ base::WeakPtr<ModelTypeStore>()); |
themes_sync_proxy.Enable(GetProxy()); |
DisableSync(); |
@@ -82,9 +82,9 @@ TEST_F(SyncContextProxyImplTest, FailToConnect2) { |
// Tests the case where the type's sync proxy shuts down first. |
TEST_F(SyncContextProxyImplTest, TypeDisconnectsFirst) { |
- scoped_ptr<ModelTypeProcessorImpl> themes_sync_proxy( |
- new ModelTypeProcessorImpl(syncer::THEMES, |
- base::WeakPtr<ModelTypeStore>())); |
+ scoped_ptr<SharedModelTypeProcessor> themes_sync_proxy( |
+ new SharedModelTypeProcessor(syncer::THEMES, |
+ base::WeakPtr<ModelTypeStore>())); |
themes_sync_proxy->Enable(GetProxy()); |
base::RunLoop run_loop_; |
@@ -96,9 +96,9 @@ TEST_F(SyncContextProxyImplTest, TypeDisconnectsFirst) { |
// Tests the case where the sync thread shuts down first. |
TEST_F(SyncContextProxyImplTest, SyncDisconnectsFirst) { |
- scoped_ptr<ModelTypeProcessorImpl> themes_sync_proxy( |
- new ModelTypeProcessorImpl(syncer::THEMES, |
- base::WeakPtr<ModelTypeStore>())); |
+ scoped_ptr<SharedModelTypeProcessor> themes_sync_proxy( |
+ new SharedModelTypeProcessor(syncer::THEMES, |
+ base::WeakPtr<ModelTypeStore>())); |
themes_sync_proxy->Enable(GetProxy()); |
base::RunLoop run_loop_; |