[Sync] Ensure that CONFIGURE_CLEAN types get unapplied before configuration

components/sync/engine/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 "components/sync/engine/fake_sync_manager.h"
 
 #include <cstddef>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 21 matching lines @@
     : initial_sync_ended_types_(initial_sync_ended_types),
       progress_marker_types_(progress_marker_types),
       configure_fail_types_(configure_fail_types),
       last_configure_reason_(CONFIGURE_REASON_UNKNOWN),
       num_invalidations_received_(0) {
   fake_encryption_handler_ = base::MakeUnique<FakeSyncEncryptionHandler>();
 }
 
 FakeSyncManager::~FakeSyncManager() {}
 
-ModelTypeSet FakeSyncManager::GetAndResetCleanedTypes() {
-  ModelTypeSet cleaned_types = cleaned_types_;
-  cleaned_types_.Clear();
-  return cleaned_types;
+ModelTypeSet FakeSyncManager::GetAndResetPurgedTypes() {
+  ModelTypeSet purged_types = purged_types_;
+  purged_types_.Clear();
+  return purged_types;
+}
+
+ModelTypeSet FakeSyncManager::GetAndResetUnappliedTypes() {
+  ModelTypeSet unapplied_types = unapplied_types_;
+  unapplied_types_.Clear();
+  return unapplied_types;
 }
 
 ModelTypeSet FakeSyncManager::GetAndResetDownloadedTypes() {
   ModelTypeSet downloaded_types = downloaded_types_;
   downloaded_types_.Clear();
   return downloaded_types;
 }
 
 ModelTypeSet FakeSyncManager::GetAndResetEnabledTypes() {
   ModelTypeSet enabled_types = enabled_types_;
@@ skipping 51 matching lines @@
 }
 
 void FakeSyncManager::PurgePartiallySyncedTypes() {
   ModelTypeSet partial_types;
   for (ModelTypeSet::Iterator i = progress_marker_types_.First(); i.Good();
        i.Inc()) {
     if (!initial_sync_ended_types_.Has(i.Get()))
       partial_types.Put(i.Get());
   }
   progress_marker_types_.RemoveAll(partial_types);
-  cleaned_types_.PutAll(partial_types);
+  purged_types_.PutAll(partial_types);
 }
 
 void FakeSyncManager::PurgeDisabledTypes(ModelTypeSet to_purge,
                                          ModelTypeSet to_journal,
                                          ModelTypeSet to_unapply) {
   // 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.
   GetUserShare()->directory->PurgeEntriesWithTypeIn(to_purge, to_journal,
                                                     to_unapply);
-  initial_sync_ended_types_.RemoveAll(to_purge);
-  progress_marker_types_.RemoveAll(to_purge);
-  cleaned_types_.PutAll(to_purge);
+  purged_types_.PutAll(to_purge);
+  unapplied_types_.PutAll(to_unapply);
+  // Types from |to_unapply| should retain their server data and progress
+  // markers.
+  initial_sync_ended_types_.RemoveAll(Difference(to_purge, to_unapply));
+  progress_marker_types_.RemoveAll(Difference(to_purge, to_unapply));
 }
 
 void FakeSyncManager::UpdateCredentials(const SyncCredentials& credentials) {
   NOTIMPLEMENTED();
 }
 
 void FakeSyncManager::StartSyncingNormally(
     const ModelSafeRoutingInfo& routing_info,
     base::Time last_poll_time) {
   // Do nothing.
@@ skipping 120 matching lines @@
 }
 
 void FakeSyncManager::OnCookieJarChanged(bool account_mismatch,
                                          bool empty_jar) {}
 
 void FakeSyncManager::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace syncer