Fix some migration-related bugs

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.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/sync/glue/data_type_manager_mock.h"
 #include "chrome/browser/sync/internal_api/write_transaction.h"
@@ skipping 58 matching lines @@
         progress_marker.set_token("dummy");
       }
       trans.GetDirectory()->SetDownloadProgress(type, progress_marker);
     }
   }
 
   void SendConfigureDone(DataTypeManager::ConfigureStatus status,
                          syncable::ModelTypeSet requested_types) {
     if (status == DataTypeManager::OK) {
       DataTypeManager::ConfigureResult result(status, requested_types);
-      content::NotificationService::current()->Notify(
-          chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
-          content::Source<DataTypeManager>(&manager_),
-          content::Details<const DataTypeManager::ConfigureResult>(&result));
+      migrator_->OnConfigureDone(result);
     } else {
       std::list<SyncError> errors;
       DataTypeManager::ConfigureResult result(
           status,
           requested_types,
           errors);
-      content::NotificationService::current()->Notify(
-          chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
-          content::Source<DataTypeManager>(&manager_),
-          content::Details<const DataTypeManager::ConfigureResult>(&result));
+      migrator_->OnConfigureDone(result);
     }
     message_loop_.RunAllPending();
   }
 
   ProfileSyncService* service() { return &service_; }
   DataTypeManagerMock* manager() { return &manager_; }
   syncable::ModelTypeSet preferred_types() { return preferred_types_; }
   BackendMigrator* migrator() { return migrator_.get(); }
   void RemovePreferredType(syncable::ModelType type) {
     preferred_types_.Remove(type);
@@ skipping 216 matching lines @@
       .WillOnce(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*manager(), Configure(_, sync_api::CONFIGURE_REASON_MIGRATION))
               .Times(1);
   migrator()->MigrateTypes(to_migrate);
   SetUnsyncedTypes(syncable::ModelTypeSet());
   SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet());
   EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());
 }
 
 };  // namespace browser_sync