| Index: chrome/browser/sync/backend_migrator_unittest.cc
|
| diff --git a/chrome/browser/sync/backend_migrator_unittest.cc b/chrome/browser/sync/backend_migrator_unittest.cc
|
| index cdc264370e3245f164770a153010d8402d66725c..bd9677bed82595e66b1f03fd27e3f42cc3579291 100644
|
| --- a/chrome/browser/sync/backend_migrator_unittest.cc
|
| +++ b/chrome/browser/sync/backend_migrator_unittest.cc
|
| @@ -59,15 +59,25 @@ class BackendMigratorTest : public testing::Test {
|
| .WillOnce(Return(snap_.get()));
|
| }
|
|
|
| - void SendConfigureDone(DataTypeManager::ConfigureResult result,
|
| + void SendConfigureDone(DataTypeManager::ConfigureStatus status,
|
| const syncable::ModelTypeSet& types) {
|
| - DataTypeManager::ConfigureResultWithErrorLocation result_with_location(
|
| - result, FROM_HERE, types);
|
| - NotificationService::current()->Notify(
|
| - chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
|
| - Source<DataTypeManager>(&manager_),
|
| - Details<DataTypeManager::ConfigureResultWithErrorLocation>(
|
| - &result_with_location));
|
| + if (status == DataTypeManager::OK) {
|
| + DataTypeManager::ConfigureResult result(status, types);
|
| + NotificationService::current()->Notify(
|
| + chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
|
| + Source<DataTypeManager>(&manager_),
|
| + Details<const DataTypeManager::ConfigureResult>(&result));
|
| + } else {
|
| + DataTypeManager::ConfigureResult result(
|
| + status,
|
| + types,
|
| + syncable::ModelTypeSet(),
|
| + FROM_HERE);
|
| + NotificationService::current()->Notify(
|
| + chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
|
| + Source<DataTypeManager>(&manager_),
|
| + Details<const DataTypeManager::ConfigureResult>(&result));
|
| + }
|
| }
|
|
|
| ProfileSyncService* service() { return &service_; }
|
|
|