summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/sync_context_proxy_impl_unittest.cc
diff options
context:
space:
mode:
authorpavely <pavely@chromium.org>2015-09-10 15:19:28 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-10 22:20:08 +0000
commit3c9575830013f5e70842c52c5757122e83b4dea8 (patch)
tree3765565a7308275b057cebf4aa1e8019ab0c6369 /sync/internal_api/sync_context_proxy_impl_unittest.cc
parentd98e50a25b7c98ede036b630c5bcde1700cb07bc (diff)
downloadchromium_src-3c9575830013f5e70842c52c5757122e83b4dea8.zip
chromium_src-3c9575830013f5e70842c52c5757122e83b4dea8.tar.gz
chromium_src-3c9575830013f5e70842c52c5757122e83b4dea8.tar.bz2
[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}
Diffstat (limited to 'sync/internal_api/sync_context_proxy_impl_unittest.cc')
-rw-r--r--sync/internal_api/sync_context_proxy_impl_unittest.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/sync/internal_api/sync_context_proxy_impl_unittest.cc b/sync/internal_api/sync_context_proxy_impl_unittest.cc
index 00fe80c..f4981d7 100644
--- a/sync/internal_api/sync_context_proxy_impl_unittest.cc
+++ b/sync/internal_api/sync_context_proxy_impl_unittest.cc
@@ -58,7 +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);
+ ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES,
+ base::WeakPtr<ModelTypeStore>());
DisableSync();
themes_sync_proxy.Enable(GetProxy());
@@ -69,7 +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);
+ ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES,
+ base::WeakPtr<ModelTypeStore>());
themes_sync_proxy.Enable(GetProxy());
DisableSync();
@@ -81,7 +83,8 @@ 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));
+ new ModelTypeProcessorImpl(syncer::THEMES,
+ base::WeakPtr<ModelTypeStore>()));
themes_sync_proxy->Enable(GetProxy());
base::RunLoop run_loop_;
@@ -94,7 +97,8 @@ 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));
+ new ModelTypeProcessorImpl(syncer::THEMES,
+ base::WeakPtr<ModelTypeStore>()));
themes_sync_proxy->Enable(GetProxy());
base::RunLoop run_loop_;