Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Unified Diff: sync/internal_api/sync_manager_impl_unittest.cc

Issue 17552014: [Sync] Have SBH tell SyncManager which types to purge (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix dchecks Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/sync_manager_impl.cc ('k') | sync/internal_api/test/fake_sync_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager_impl_unittest.cc
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index ff04a0b812643c974f6cf75e156af8e0123b2b99..523621e11559a2d21acaca635f4932c1322dcb53 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -2908,7 +2908,7 @@ TEST_F(SyncManagerTestWithMockScheduler, BasicConfiguration) {
sync_manager_.ConfigureSyncer(
reason,
types_to_download,
- ModelTypeSet(),
+ disabled_types,
ModelTypeSet(),
ModelTypeSet(),
new_routing_info,
@@ -3113,8 +3113,7 @@ TEST_F(SyncManagerTest, PurgeDisabledTypes) {
// Verify all the enabled types remain after cleanup, and all the disabled
// types were purged.
- sync_manager_.PurgeDisabledTypes(ModelTypeSet::All(),
- enabled_types,
+ sync_manager_.PurgeDisabledTypes(disabled_types,
ModelTypeSet(),
ModelTypeSet());
EXPECT_TRUE(enabled_types.Equals(sync_manager_.InitialSyncEndedTypes()));
@@ -3128,8 +3127,7 @@ TEST_F(SyncManagerTest, PurgeDisabledTypes) {
Difference(ModelTypeSet::All(), disabled_types);
// Verify only the non-disabled types remain after cleanup.
- sync_manager_.PurgeDisabledTypes(enabled_types,
- new_enabled_types,
+ sync_manager_.PurgeDisabledTypes(disabled_types,
ModelTypeSet(),
ModelTypeSet());
EXPECT_TRUE(new_enabled_types.Equals(sync_manager_.InitialSyncEndedTypes()));
@@ -3207,10 +3205,7 @@ TEST_F(SyncManagerTest, PurgeUnappliedTypes) {
// Now request a purge for the unapplied types.
disabled_types.PutAll(unapplied_types);
- ModelTypeSet new_enabled_types =
- Difference(ModelTypeSet::All(), disabled_types);
- sync_manager_.PurgeDisabledTypes(enabled_types,
- new_enabled_types,
+ sync_manager_.PurgeDisabledTypes(disabled_types,
ModelTypeSet(),
unapplied_types);
« no previous file with comments | « sync/internal_api/sync_manager_impl.cc ('k') | sync/internal_api/test/fake_sync_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698