[Sync] Ensure that CONFIGURE_CLEAN types get unapplied before configuration

components/sync/engine/fake_sync_manager.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_ENGINE_FAKE_SYNC_MANAGER_H_
 #define COMPONENTS_SYNC_ENGINE_FAKE_SYNC_MANAGER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 24 matching lines @@
   //
   // |configure_fail_types|: The set of types that will fail
   // configuration. Once ConfigureSyncer is called, the
   // |initial_sync_ended_types_| and |progress_marker_types_| will be updated
   // to include those types that didn't fail.
   FakeSyncManager(ModelTypeSet initial_sync_ended_types,
                   ModelTypeSet progress_marker_types,
                   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.
   ModelTypeSet GetAndResetDownloadedTypes();
 
   // Returns those types that have been marked as enabled since the
   // last call to GetAndResetEnabledTypes(), or since startup if never
   // called.
   ModelTypeSet GetAndResetEnabledTypes();
 
@@ skipping 64 matching lines @@
   base::ObserverList<SyncManager::Observer> observers_;
 
   // Faked directory state.
   ModelTypeSet initial_sync_ended_types_;
   ModelTypeSet progress_marker_types_;
 
   // Test specific state.
   // 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.
   ModelTypeSet enabled_types_;
 
   // The types for which a refresh was most recently requested.
   ModelTypeSet last_refresh_request_types_;
 
   // The most recent configure reason.
   ConfigureReason last_configure_reason_;
 
   std::unique_ptr<FakeSyncEncryptionHandler> fake_encryption_handler_;
 
   TestUserShare test_user_share_;
 
   // Number of invalidations received since startup.
   int num_invalidations_received_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSyncManager);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_FAKE_SYNC_MANAGER_H_