[Sync] Ensure that CONFIGURE_CLEAN types get unapplied before configuration

components/sync/engine/fake_sync_manager.h

Index: components/sync/engine/fake_sync_manager.h
diff --git a/components/sync/engine/fake_sync_manager.h b/components/sync/engine/fake_sync_manager.h
index 42f0c26d1932183939e1dd14e009789d783f267b..e1cdec3513741e77cc63cf4b9513a8291fc3752f 100644
--- a/components/sync/engine/fake_sync_manager.h
+++ b/components/sync/engine/fake_sync_manager.h
@@ -42,10 +42,13 @@ class FakeSyncManager : public SyncManager {
                   ModelTypeSet configure_fail_types);
   ~FakeSyncManager() override;
 
-  // Returns those types that have been cleaned (purged from the directory)
-  // since the last call to GetAndResetCleanedTypes(), or since startup if never
-  // called.
-  ModelTypeSet GetAndResetCleanedTypes();
+  // Returns those types that have been purged from the directory since the last
+  // call to GetAndResetPurgedTypes(), or since startup if never called.
+  ModelTypeSet GetAndResetPurgedTypes();
+
+  // Returns those types that have been unapplied as part of purging disabled
+  // types.

[Nicolas Zea, 2016/12/17 00:18:55]

nit: may as well call out "since the last call to GetAndReset.."

+  ModelTypeSet GetAndResetUnappliedTypes();
 
   // Returns those types that have been downloaded since the last call to
   // GetAndResetDownloadedTypes(), or since startup if never called.
@@ -130,8 +133,10 @@ class FakeSyncManager : public SyncManager {
   // The types that should fail configuration attempts. These types will not
   // have their progress markers or initial_sync_ended bits set.
   ModelTypeSet configure_fail_types_;
-  // The set of types that have been cleaned up.
-  ModelTypeSet cleaned_types_;
+  // The set of types that have been purged.
+  ModelTypeSet purged_types_;
+  // Subset of |purged_types_| that were unapplied.
+  ModelTypeSet unapplied_types_;
   // The set of types that have been downloaded.
   ModelTypeSet downloaded_types_;
   // The set of types that have been enabled.