Revert 148792 - [Sync] Remove CleanupDisabledTypes command and move purge logic into SyncManager.

sync/internal_api/sync_manager_impl.cc

Index: sync/internal_api/sync_manager_impl.cc
===================================================================
--- sync/internal_api/sync_manager_impl.cc	(revision 148811)
+++ sync/internal_api/sync_manager_impl.cc	(working copy)
@@ -340,19 +340,6 @@
   DCHECK(!ready_task.is_null());
   DCHECK(!retry_task.is_null());
 
-  // Cleanup any types that might have just been disabled.
-  ModelTypeSet previous_types = ModelTypeSet::All();
-  if (!session_context_->routing_info().empty())
-    previous_types = GetRoutingInfoTypes(session_context_->routing_info());
-  if (!PurgeDisabledTypes(previous_types,
-                          GetRoutingInfoTypes(new_routing_info))) {
-    // We failed to cleanup the types. Invoke the ready task without actually
-    // configuring any types. The caller should detect this as a configuration
-    // failure and act appropriately.
-    ready_task.Run();
-    return;
-  }
-
   // TODO(zea): set this based on whether cryptographer has keystore
   // encryption key or not (requires opening a transaction). crbug.com/129665.
   ConfigurationParams::KeystoreKeyStatus keystore_key_status =
@@ -471,19 +458,7 @@
     // trigger the migration logic before the backend is initialized, resulting
     // in crashes. We therefore detect and purge any partially synced types as
     // part of initialization.
-    //
-    // Similarly, a type may have been disabled previously, but we didn't
-    // manage to purge. Ensure we cleanup any disabled types before starting up.
-    //
-    // Note: If either of these methods fail, we have directory corruption and
-    // cannot continue.
-    // TODO(rlarocque): remove the PurgeDisabledTypes call once we no longer
-    // initialize the session context with the enabled types (purging disabled
-    // types will be done within ConfigureSyncer).
-    if (!PurgePartiallySyncedTypes() ||
-        !PurgeDisabledTypes(
-            ModelTypeSet::All(),
-            GetRoutingInfoTypes(session_context_->routing_info())))
+    if (!PurgePartiallySyncedTypes())
       success = false;
 
     // Cryptographer should only be accessed while holding a
@@ -729,19 +704,6 @@
   return directory()->PurgeEntriesWithTypeIn(partially_synced_types);
 }
 
-bool SyncManagerImpl::PurgeDisabledTypes(
-    ModelTypeSet previously_enabled_types,
-    ModelTypeSet currently_enabled_types) {
-  ModelTypeSet disabled_types = Difference(previously_enabled_types,
-                                           currently_enabled_types);
-  if (disabled_types.Empty())
-    return true;
-
-  DVLOG(1) << "Purging disabled types "
-           << ModelTypeSetToString(disabled_types);
-  return directory()->PurgeEntriesWithTypeIn(disabled_types);
-}
-
 void SyncManagerImpl::UpdateCredentials(
     const SyncCredentials& credentials) {
   DCHECK(thread_checker_.CalledOnValidThread());