Revert 288464 "[Sync] Cleanup datatype configuration error handl..."

trunk/src/chrome/browser/sync/backend_migrator_unittest.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/message_loop.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
@@ skipping 61 matching lines @@
       trans.GetDirectory()->SetDownloadProgress(type, progress_marker);
     }
   }
 
   void SendConfigureDone(DataTypeManager::ConfigureStatus status,
                          syncer::ModelTypeSet requested_types) {
     if (status == DataTypeManager::OK) {
       DataTypeManager::ConfigureResult result(status, requested_types);
       migrator_->OnConfigureDone(result);
     } else {
+      std::map<syncer::ModelType, syncer::SyncError> errors;
       DataTypeManager::ConfigureResult result(
           status,
-          requested_types);
+          requested_types,
+          errors,
+          syncer::ModelTypeSet(),
+          syncer::ModelTypeSet());
       migrator_->OnConfigureDone(result);
     }
     message_loop_.RunUntilIdle();
   }
 
   ProfileSyncService* service() { return &service_; }
   DataTypeManagerMock* manager() { return &manager_; }
   syncer::ModelTypeSet preferred_types() { return preferred_types_; }
   BackendMigrator* migrator() { return migrator_.get(); }
   void RemovePreferredType(syncer::ModelType type) {
@@ skipping 236 matching lines @@
   EXPECT_CALL(
       *manager(),
       PurgeForMigration(_, syncer::CONFIGURE_REASON_MIGRATION)).Times(1);
   migrator()->MigrateTypes(to_migrate);
   SetUnsyncedTypes(syncer::ModelTypeSet());
   SendConfigureDone(DataTypeManager::ABORTED, syncer::ModelTypeSet());
   EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());
 }
 
 };  // namespace browser_sync