[Sync] Refactor sync datatype error handling.

chrome/browser/sync/profile_sync_service_startup_unittest.cc

Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index ce5feec2f0793372c22ec1babdc4ca76c19a3c5c..718743d7323e02e70a2dbd0cbc58f057c824d5d0 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -245,10 +245,13 @@ TEST_F(ProfileSyncServiceStartupTest, ClearServerData) {
 
 TEST_F(ProfileSyncServiceStartupTest, SKIP_MACOSX(StartFailure)) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
-  DataTypeManager::ConfigureResult configure_result =
+  DataTypeManager::ConfigureStatus status =
       DataTypeManager::ASSOCIATION_FAILED;
-  browser_sync::DataTypeManager::ConfigureResultWithErrorLocation result(
-      configure_result, FROM_HERE, syncable::ModelTypeSet());
+  browser_sync::DataTypeManager::ConfigureResult result(
+      status,
+      syncable::ModelTypeSet(),
+      syncable::ModelTypeSet(),
+      FROM_HERE);
   EXPECT_CALL(*data_type_manager, Configure(_, _)).
       WillRepeatedly(
           DoAll(