Reland 87645 with clang fixes.

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index e9625e600b6181c229db3e230f15b0aaf6de9330..f0b3a64bc462f3a97e3abff7c9091fa3db7be0cf 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1263,13 +1263,12 @@ void ProfileSyncService::Observe(int type,
       break;
     }
     case chrome::NOTIFICATION_SYNC_CONFIGURE_DONE: {
-      DataTypeManager::ConfigureResultWithErrorLocation* result_with_location =
-          Details<DataTypeManager::ConfigureResultWithErrorLocation>(
-              details).ptr();
+      DataTypeManager::ConfigureResult* result =
+          Details<DataTypeManager::ConfigureResult>(details).ptr();
 
-      DataTypeManager::ConfigureResult result = result_with_location->result;
-      VLOG(1) << "PSS SYNC_CONFIGURE_DONE called with result: " << result;
-      if (result == DataTypeManager::ABORTED &&
+      DataTypeManager::ConfigureStatus status = result->status;
+      VLOG(1) << "PSS SYNC_CONFIGURE_DONE called with status: " << status;
+      if (status == DataTypeManager::ABORTED &&
           expect_sync_configuration_aborted_) {
         VLOG(0) << "ProfileSyncService::Observe Sync Configure aborted";
         expect_sync_configuration_aborted_ = false;
@@ -1277,11 +1276,13 @@ void ProfileSyncService::Observe(int type,
       }
       // Clear out the gaia password if it is already there.
       gaia_password_ = std::string();
-      if (result != DataTypeManager::OK) {
+      if (status != DataTypeManager::OK) {
         VLOG(0) << "ProfileSyncService::Observe: Unrecoverable error detected";
-        std::string message = StringPrintf("Sync Configuration failed with %d",
-                                            result);
-        OnUnrecoverableError(*(result_with_location->location), message);
+        std::string message =
+          "Sync Configuration failed while configuring " +
+          syncable::ModelTypeSetToString(result->failed_types) +
+          ": " + DataTypeManager::ConfigureStatusToString(status);
+        OnUnrecoverableError(result->location, message);
         cached_passphrase_ = CachedPassphrase();
         return;
       }