[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 322f33c35a9ebb49b73b2c3e04bc46faa71b71ff..652230e65ec947cbfe60d6faaccaa7971189a45c 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -275,10 +275,13 @@ TEST_F(ProfileSyncServiceStartupTest, ClearServerData) {
 
 TEST_F(ProfileSyncServiceStartupTest, 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(