[Sync] Separate purge types step from sync manager configuration.

components/sync/driver/glue/sync_backend_host_core.h

 // Copyright 2013 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_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
 #define COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 64 matching lines @@
   const base::FilePath local_sync_backend_folder;
   std::string restored_key_for_bootstrapping;
   std::string restored_keystore_key_for_bootstrapping;
   std::unique_ptr<EngineComponentsFactory> engine_components_factory;
   const WeakHandle<UnrecoverableErrorHandler> unrecoverable_error_handler;
   base::Closure report_unrecoverable_error_function;
   std::unique_ptr<SyncEncryptionHandler::NigoriState> saved_nigori_state;
   const std::map<ModelType, int64_t> invalidation_versions;
 };
 
-// Helper struct to handle currying params to
-// SyncBackendHostCore::DoConfigureSyncer.
-struct DoConfigureSyncerTypes {
-  DoConfigureSyncerTypes();
-  DoConfigureSyncerTypes(const DoConfigureSyncerTypes& other);
-  ~DoConfigureSyncerTypes();
-  ModelTypeSet to_download;
-  ModelTypeSet to_purge;
-  ModelTypeSet to_journal;
-  ModelTypeSet to_unapply;
-};
-
 class SyncBackendHostCore
     : public base::RefCountedThreadSafe<SyncBackendHostCore>,
       public base::trace_event::MemoryDumpProvider,
       public SyncEncryptionHandler::Observer,
       public SyncManager::Observer,
       public TypeDebugInfoObserver {
  public:
   SyncBackendHostCore(const std::string& name,
                       const base::FilePath& sync_data_folder_path,
                       const base::WeakPtr<SyncBackendHostImpl>& backend);
@@ skipping 91 matching lines @@
   // The shutdown order is a bit complicated:
   // 1) Call ShutdownOnUIThread() from |frontend_loop_| to request sync manager
   //    to stop as soon as possible.
   // 2) Post DoShutdown() to sync loop to clean up backend state, save
   //    directory and destroy sync manager.
   void ShutdownOnUIThread();
   void DoShutdown(ShutdownReason reason);
   void DoDestroySyncManager(ShutdownReason reason);
 
   // Configuration methods that must execute on sync loop.
+  void DoPurgeDisabledTypes(const ModelTypeSet& to_purge,
+                            const ModelTypeSet& to_journal,
+                            const ModelTypeSet& to_unapply);
   void DoConfigureSyncer(
       ConfigureReason reason,
-      const DoConfigureSyncerTypes& config_types,
+      const ModelTypeSet& to_download,
       const ModelSafeRoutingInfo routing_info,
       const base::Callback<void(ModelTypeSet, ModelTypeSet)>& ready_task,
       const base::Closure& retry_callback);
   void DoFinishConfigureDataTypes(
       ModelTypeSet types_to_config,
       const base::Callback<void(ModelTypeSet, ModelTypeSet)>& ready_task);
   void DoRetryConfiguration(const base::Closure& retry_callback);
 
   // Set the base request context to use when making HTTP calls.
   // This method will add a reference to the context to persist it
@@ skipping 99 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_