Revert 288464 "[Sync] Cleanup datatype configuration error handl..."

trunk/src/components/sync_driver/failed_data_types_handler.cc

Index: trunk/src/components/sync_driver/failed_data_types_handler.cc
===================================================================
--- trunk/src/components/sync_driver/failed_data_types_handler.cc	(revision 289114)
+++ trunk/src/components/sync_driver/failed_data_types_handler.cc	(working copy)
@@ -32,8 +32,6 @@
   if (errors.empty())
     return false;
 
-  DVLOG(1) << "Setting " << errors.size() << " new failed types.";
-
   for (TypeErrorMap::const_iterator iter = errors.begin(); iter != errors.end();
        ++iter) {
     syncer::SyncError::ErrorType failure_type = iter->second.error_type();
@@ -93,11 +91,11 @@
 FailedDataTypesHandler::TypeErrorMap FailedDataTypesHandler::GetAllErrors()
     const {
   TypeErrorMap result;
+  result = unrecoverable_errors_;
   result.insert(data_type_errors_.begin(), data_type_errors_.end());
   result.insert(crypto_errors_.begin(), crypto_errors_.end());
   result.insert(persistence_errors_.begin(), persistence_errors_.end());
   result.insert(unready_errors_.begin(), unready_errors_.end());
-  result.insert(unrecoverable_errors_.begin(), unrecoverable_errors_.end());
   return result;
 }
 
@@ -110,9 +108,8 @@
 
 syncer::ModelTypeSet FailedDataTypesHandler::GetFatalErrorTypes()
     const {
-  syncer::ModelTypeSet result;
+  syncer::ModelTypeSet result = GetTypesFromErrorMap(unrecoverable_errors_);
   result.PutAll(GetTypesFromErrorMap(data_type_errors_));
-  result.PutAll(GetTypesFromErrorMap(unrecoverable_errors_));
   return result;
 }
 
@@ -131,25 +128,10 @@
   return result;
 }
 
-syncer::ModelTypeSet FailedDataTypesHandler::GetUnrecoverableErrorTypes()
-    const {
-  syncer::ModelTypeSet result = GetTypesFromErrorMap(unrecoverable_errors_);
-  return result;
-}
-
-syncer::SyncError FailedDataTypesHandler::GetUnrecoverableError() const {
-  // Just return the first one. It is assumed all the unrecoverable errors
-  // have the same cause. The others are just tracked to know which types
-  // were involved.
-  return (unrecoverable_errors_.empty()
-              ? syncer::SyncError()
-              : unrecoverable_errors_.begin()->second);
-}
-
 bool FailedDataTypesHandler::AnyFailedDataType() const {
   // Note: persistence errors are not failed types. They just trigger automatic
   // unapply + getupdates, at which point they are associated like normal.
-  return unrecoverable_errors_.empty() ||
+  return !unrecoverable_errors_.empty() ||
          !data_type_errors_.empty() ||
          !crypto_errors_.empty();
 }