[Sync] Have SBH tell SyncManager which types to purge

sync/internal_api/sync_manager_impl_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Unit tests for the SyncApi. Note that a lot of the underlying
 // functionality is provided by the Syncable layer, which has its own
 // unit tests. We'll test SyncApi specific things in this harness.
 
 #include <cstddef>
 #include <map>
@@ skipping 2890 matching lines @@
   ModelTypeSet protocol_types = ProtocolTypes();
   for (ModelTypeSet::Iterator iter = protocol_types.First(); iter.Good();
        iter.Inc()) {
     SetProgressMarkerForType(iter.Get(), true);
   }
 
   CallbackCounter ready_task_counter, retry_task_counter;
   sync_manager_.ConfigureSyncer(
       reason,
       types_to_download,
-      ModelTypeSet(),
+      disabled_types,
       ModelTypeSet(),
       ModelTypeSet(),
       new_routing_info,
       base::Bind(&CallbackCounter::Callback,
                  base::Unretained(&ready_task_counter)),
       base::Bind(&CallbackCounter::Callback,
                  base::Unretained(&retry_task_counter)));
   EXPECT_EQ(0, ready_task_counter.times_called());
   EXPECT_EQ(0, retry_task_counter.times_called());
   EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::RECONFIGURATION,
@@ skipping 184 matching lines @@
 
   // Set progress markers for all types.
   ModelTypeSet protocol_types = ProtocolTypes();
   for (ModelTypeSet::Iterator iter = protocol_types.First(); iter.Good();
        iter.Inc()) {
     SetProgressMarkerForType(iter.Get(), true);
   }
 
   // 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()));
   EXPECT_TRUE(disabled_types.Equals(
       sync_manager_.GetTypesWithEmptyProgressMarkerToken(ModelTypeSet::All())));
 
   // Disable some more types.
   disabled_types.Put(BOOKMARKS);
   disabled_types.Put(PREFERENCES);
   ModelTypeSet new_enabled_types =
       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()));
   EXPECT_TRUE(disabled_types.Equals(
       sync_manager_.GetTypesWithEmptyProgressMarkerToken(ModelTypeSet::All())));
 }
 
 // Test PurgeDisabledTypes properly unapplies types by deleting their local data
 // and preserving their server data and progress marker.
 TEST_F(SyncManagerTest, PurgeUnappliedTypes) {
@@ skipping 57 matching lines @@
     pref5.Put(syncable::IS_DEL, true);
     pref5.Put(syncable::BASE_VERSION, -1);
     // Bookmark is already set up properly
   }
 
   // Take a snapshot to clear all the dirty bits.
   share->directory.get()->SaveChanges();
 
    // 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);
 
   // Verify the unapplied types still have progress markers and initial sync
   // ended after cleanup.
   EXPECT_TRUE(sync_manager_.InitialSyncEndedTypes().HasAll(unapplied_types));
   EXPECT_TRUE(
       sync_manager_.GetTypesWithEmptyProgressMarkerToken(unapplied_types).
           Empty());
 
@@ skipping 351 matching lines @@
   size_t folder_b_pos =
       FindChangeInList(folder_b_id, ChangeRecord::ACTION_DELETE);
   size_t child_pos = FindChangeInList(child_id, ChangeRecord::ACTION_DELETE);
 
   // Deletes should appear before updates.
   EXPECT_LT(child_pos, folder_a_pos);
   EXPECT_LT(folder_b_pos, folder_a_pos);
 }
 
 }  // namespace