Revert 94128 - [Sync] Refactor sync datatype error handling.

chrome/browser/sync/backend_migrator_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/glue/data_type_manager_mock.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 41 matching lines @@
       download_progress_markers[*it] = "foobar";
     }
 
     snap_.reset(new SyncSessionSnapshot(SyncerStatus(), ErrorCounters(),
         0, false, syncable::ModelTypeBitSet(), download_progress_markers,
         false, false, 0, 0, 0, false, sessions::SyncSourceInfo(), 0));
     EXPECT_CALL(service_, GetLastSessionSnapshot())
         .WillOnce(Return(snap_.get()));
   }
 
-  void SendConfigureDone(DataTypeManager::ConfigureStatus status,
+  void SendConfigureDone(DataTypeManager::ConfigureResult result,
                          const syncable::ModelTypeSet& types) {
-    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));
-    }
+    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));
   }
 
   ProfileSyncService* service() { return &service_; }
   DataTypeManagerMock* manager() { return &manager_; }
   const syncable::ModelTypeSet& preferred_types() { return preferred_types_; }
   void RemovePreferredType(syncable::ModelType type) {
     preferred_types_.erase(type);
     Mock::VerifyAndClear(&service_);
     ON_CALL(service_, GetPreferredDataTypes(_)).
         WillByDefault(SetArgumentPointee<0>(preferred_types_));
@@ skipping 218 matching lines @@
   EXPECT_CALL(*manager(), state())
       .WillOnce(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*manager(), Configure(_, sync_api::CONFIGURE_REASON_MIGRATION))
               .Times(1);
   migrator.MigrateTypes(to_migrate);
   SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet());
   EXPECT_EQ(BackendMigrator::IDLE, migrator.state());
 }
 
 };  // namespace browser_sync