[Sync] Have SBH tell SyncManager which types to purge

sync/internal_api/test/fake_sync_manager.cc

 // Copyright (c) 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.
 
 #include "sync/internal_api/public/test/fake_sync_manager.h"
 
 #include <cstddef>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 175 matching lines @@
 }
 
 void FakeSyncManager::StartSyncingNormally(
       const ModelSafeRoutingInfo& routing_info) {
   // Do nothing.
 }
 
 void FakeSyncManager::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) {
   last_configure_reason_ = reason;
   ModelTypeSet enabled_types = GetRoutingInfoTypes(new_routing_info);
-  ModelTypeSet disabled_types = Difference(
-      ModelTypeSet::All(), enabled_types);
-  disabled_types.RemoveAll(to_ignore);
   ModelTypeSet success_types = to_download;
   success_types.RemoveAll(configure_fail_types_);
 
   DVLOG(1) << "Faking configuration. Downloading: "
            << ModelTypeSetToString(success_types) << ". Cleaning: "
-           << ModelTypeSetToString(disabled_types);
+           << ModelTypeSetToString(to_purge);
 
   // Update our fake directory by clearing and fake-downloading as necessary.
   UserShare* share = GetUserShare();
-  share->directory->PurgeEntriesWithTypeIn(disabled_types,
+  share->directory->PurgeEntriesWithTypeIn(to_purge,
                                            to_journal,
                                            to_unapply);
   for (ModelTypeSet::Iterator it = success_types.First(); it.Good(); it.Inc()) {
     // We must be careful to not create the same root node twice.
     if (!initial_sync_ended_types_.Has(it.Get())) {
       TestUserShare::CreateRoot(it.Get(), share);
     }
   }
 
   // Simulate cleaning up disabled types.
   // TODO(sync): consider only cleaning those types that were recently disabled,
   // if this isn't the first cleanup, which more accurately reflects the
   // behavior of the real cleanup logic.
-  initial_sync_ended_types_.RemoveAll(disabled_types);
-  progress_marker_types_.RemoveAll(disabled_types);
-  cleaned_types_.PutAll(disabled_types);
+  initial_sync_ended_types_.RemoveAll(to_purge);
+  progress_marker_types_.RemoveAll(to_purge);
+  cleaned_types_.PutAll(to_purge);
 
   // Now simulate the actual configuration for those types that successfully
   // download + apply.
   progress_marker_types_.PutAll(success_types);
   initial_sync_ended_types_.PutAll(success_types);
   downloaded_types_.PutAll(success_types);
 
   ready_task.Run();
 }
 
@@ skipping 60 matching lines @@
     InvalidatorState state) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   registrar_.UpdateInvalidatorState(state);
 }
 
 ModelTypeSet FakeSyncManager::GetLastRefreshRequestTypes() {
   return last_refresh_request_types_;
 }
 
 }  // namespace syncer