[Sync] Have SBH tell SyncManager which types to purge

The SBH now specifies as part of the ConfigureSyncer call which types need to
be purged. This is determined by whether this is a control types config (in
which case all disabled types are purged) or whether any types have been
disabled since the last configuration (as determined by the SBR).

BUG=247115

Review URL: https://chromiumcodereview.appspot.com/17552014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208074 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 8 deletions

diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index 12636fe..c12eea7 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -106,9 +106,9 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl :
   virtual void ConfigureSyncer(
       ConfigureReason reason,
       ModelTypeSet to_download,
+      ModelTypeSet to_purge,
       ModelTypeSet to_journal,
       ModelTypeSet to_unapply,
-      ModelTypeSet to_ignore,
       const ModelSafeRoutingInfo& new_routing_info,
       const base::Closure& ready_task,
       const base::Closure& retry_task) OVERRIDE;
@@ -241,13 +241,11 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl :
   // Open the directory named with |username|.
   bool OpenDirectory(const std::string& username);
 
-  // Purge those types from |previously_enabled_types| that are no longer
-  // enabled in |currently_enabled_types|. |to_journal| and |to_unapply|
-  // specify types that require special handling. |to_journal| types are saved
-  // into the delete journal, while |to_unapply| have only their local data
-  // deleted, while their server data is preserved.
-  bool PurgeDisabledTypes(ModelTypeSet previously_enabled_types,
-                          ModelTypeSet currently_enabled_types,
+  // Purge those disabled types as specified by |to_purge|. |to_journal| and
+  // |to_unapply| specify subsets that require special handling. |to_journal|
+  // types are saved into the delete journal, while |to_unapply| have only
+  // their local data deleted, while their server data is preserved.
+  bool PurgeDisabledTypes(ModelTypeSet to_purge,
                           ModelTypeSet to_journal,
                           ModelTypeSet to_unapply);