sync: Introduce control data types

chrome/browser/sync/backend_migrator.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 "chrome/browser/sync/backend_migrator.h"
 
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 83 matching lines @@
   if (manager_->state() == DataTypeManager::CONFIGURED) {
     RestartMigration();
     return true;
   }
   return false;
 }
 
 void BackendMigrator::RestartMigration() {
   // We'll now disable any running types that need to be migrated.
   ChangeState(DISABLING_TYPES);
-  const ModelTypeSet full_set = service_->GetPreferredDataTypes();
-  const ModelTypeSet difference = Difference(full_set, to_migrate_);
-  bool configure_with_nigori = !to_migrate_.Has(syncer::NIGORI);
   SDVLOG(1) << "BackendMigrator disabling types "
-            << ModelTypeSetToString(to_migrate_) << "; configuring "
-            << ModelTypeSetToString(difference)
-            << (configure_with_nigori ? " with nigori" : " without nigori");
+            << ModelTypeSetToString(to_migrate_);
 
-  // Add nigori for config or not based upon if the server told us to migrate
-  // nigori or not.
-  if (configure_with_nigori) {
-    manager_->Configure(difference, syncer::CONFIGURE_REASON_MIGRATION);
-  } else {
-    manager_->ConfigureWithoutNigori(difference,
-                                     syncer::CONFIGURE_REASON_MIGRATION);
-  }
+  manager_->PurgeForMigration(to_migrate_, syncer::CONFIGURE_REASON_MIGRATION);
 }
 
 void BackendMigrator::OnConfigureDone(
     const DataTypeManager::ConfigureResult& result) {
   if (state_ == IDLE)
     return;
 
   // |manager_|'s methods aren't re-entrant, and we're notified from
   // them, so post a task to avoid problems.
   SDVLOG(1) << "Posting OnConfigureDoneImpl";
@@ skipping 98 matching lines @@
 
 syncer::ModelTypeSet BackendMigrator::GetPendingMigrationTypesForTest() const {
   return to_migrate_;
 }
 
 #undef SDVLOG
 
 #undef SLOG
 
 };  // namespace browser_sync