From 3c9575830013f5e70842c52c5757122e83b4dea8 Mon Sep 17 00:00:00 2001 From: pavely Date: Thu, 10 Sep 2015 15:19:28 -0700 Subject: [Sync] Introduce ModelTypeStore interface In this change: - Add empty ModelTypeStore interface - Pass WeakPtr to store into ModelTypeProcessorImpl::ctor. BUG=517663 R=stanisc@chromium.org Review URL: https://codereview.chromium.org/1311363009 Cr-Commit-Position: refs/heads/master@{#348255} --- sync/sessions/model_type_registry_unittest.cc | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'sync/sessions') diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc index 648a6a8..9ab1d29 100644 --- a/sync/sessions/model_type_registry_unittest.cc +++ b/sync/sessions/model_type_registry_unittest.cc @@ -17,8 +17,6 @@ namespace syncer { -using syncer_v2::ModelTypeProcessorImpl; - class ModelTypeRegistryTest : public ::testing::Test { public: ModelTypeRegistryTest(); @@ -145,8 +143,10 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_OffAndOn) { } TEST_F(ModelTypeRegistryTest, NonBlockingTypes) { - ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES); - ModelTypeProcessorImpl sessions_sync_proxy(syncer::SESSIONS); + syncer_v2::ModelTypeProcessorImpl themes_sync_proxy( + syncer::THEMES, base::WeakPtr()); + syncer_v2::ModelTypeProcessorImpl sessions_sync_proxy( + syncer::SESSIONS, base::WeakPtr()); scoped_refptr task_runner = new base::DeferredSequencedTaskRunner( base::ThreadTaskRunnerHandle::Get()); @@ -176,8 +176,10 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypes) { } TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) { - ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES); - ModelTypeProcessorImpl sessions_sync_proxy(syncer::SESSIONS); + syncer_v2::ModelTypeProcessorImpl themes_sync_proxy( + syncer::THEMES, base::WeakPtr()); + syncer_v2::ModelTypeProcessorImpl sessions_sync_proxy( + syncer::SESSIONS, base::WeakPtr()); scoped_refptr task_runner = new base::DeferredSequencedTaskRunner( base::ThreadTaskRunnerHandle::Get()); @@ -224,10 +226,12 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) { } TEST_F(ModelTypeRegistryTest, DeletionOrdering) { - scoped_ptr themes_sync_proxy( - new ModelTypeProcessorImpl(syncer::THEMES)); - scoped_ptr sessions_sync_proxy( - new ModelTypeProcessorImpl(syncer::SESSIONS)); + scoped_ptr themes_sync_proxy( + new syncer_v2::ModelTypeProcessorImpl( + syncer::THEMES, base::WeakPtr())); + scoped_ptr sessions_sync_proxy( + new syncer_v2::ModelTypeProcessorImpl( + syncer::SESSIONS, base::WeakPtr())); scoped_refptr task_runner = new base::DeferredSequencedTaskRunner( base::ThreadTaskRunnerHandle::Get()); -- cgit v1.1