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

chrome/browser/sync/profile_sync_service.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/profile_sync_service.h"
 
 #include <stddef.h>
 #include <map>
 #include <ostream>
 #include <set>
@@ skipping 1245 matching lines @@
 void ProfileSyncService::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_SYNC_CONFIGURE_START: {
       NotifyObservers();
       // TODO(sync): Maybe toast?
       break;
     }
     case chrome::NOTIFICATION_SYNC_CONFIGURE_DONE: {
-      DataTypeManager::ConfigureResult* result =
-          Details<DataTypeManager::ConfigureResult>(details).ptr();
+      DataTypeManager::ConfigureResultWithErrorLocation* result_with_location =
+          Details<DataTypeManager::ConfigureResultWithErrorLocation>(
+              details).ptr();
 
-      DataTypeManager::ConfigureStatus status = result->status;
-      VLOG(1) << "PSS SYNC_CONFIGURE_DONE called with status: " << status;
-      if (status == DataTypeManager::ABORTED &&
+      DataTypeManager::ConfigureResult result = result_with_location->result;
+      VLOG(1) << "PSS SYNC_CONFIGURE_DONE called with result: " << result;
+      if (result == DataTypeManager::ABORTED &&
           expect_sync_configuration_aborted_) {
         VLOG(0) << "ProfileSyncService::Observe Sync Configure aborted";
         expect_sync_configuration_aborted_ = false;
         return;
       }
       // Clear out the gaia password if it is already there.
       gaia_password_ = std::string();
-      if (status != DataTypeManager::OK) {
+      if (result != DataTypeManager::OK) {
         VLOG(0) << "ProfileSyncService::Observe: Unrecoverable error detected";
-        std::string message =
-          "Sync Configuration failed while configuring " +
-          syncable::ModelTypeSetToString(result->failed_types) +
-          ": " + DataTypeManager::ConfigureStatusToString(status);
-        OnUnrecoverableError(result->location, message);
+        std::string message = StringPrintf("Sync Configuration failed with %d",
+                                            result);
+        OnUnrecoverableError(*(result_with_location->location), message);
         cached_passphrase_ = CachedPassphrase();
         return;
       }
 
       // If the user had entered a custom passphrase use it now.
       if (!cached_passphrase_.value.empty()) {
         // Don't hold on to the passphrase in raw form longer than needed.
         SetPassphrase(cached_passphrase_.value,
                       cached_passphrase_.is_explicit,
                       cached_passphrase_.is_creation);
@@ skipping 124 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }