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

chrome/browser/sync/glue/data_type_manager.cc

Index: chrome/browser/sync/glue/data_type_manager.cc
===================================================================
--- chrome/browser/sync/glue/data_type_manager.cc	(revision 94142)
+++ chrome/browser/sync/glue/data_type_manager.cc	(working copy)
@@ -6,42 +6,12 @@
 
 namespace browser_sync {
 
-DataTypeManager::ConfigureResult::ConfigureResult() {}
+DataTypeManager::ConfigureResultWithErrorLocation::
+    ~ConfigureResultWithErrorLocation() {}
 
-DataTypeManager::ConfigureResult::ConfigureResult(ConfigureStatus status,
-                                                  TypeSet requested_types)
-    : status(status),
-      requested_types(requested_types) {
-  DCHECK_EQ(OK, status);
+DataTypeManager::ConfigureResultWithErrorLocation::
+    ConfigureResultWithErrorLocation()
+    : result(OK) {
 }
 
-DataTypeManager::ConfigureResult::ConfigureResult(
-    ConfigureStatus status,
-    TypeSet requested_types,
-    TypeSet failed_types,
-    const tracked_objects::Location& location)
-    : status(status),
-      requested_types(requested_types),
-      failed_types(failed_types),
-      location(location) {
-  DCHECK_NE(OK, status);
-}
-
-// Static.
-std::string DataTypeManager::ConfigureStatusToString(ConfigureStatus status) {
-  switch (status) {
-    case OK:
-      return "Ok";
-    case ASSOCIATION_FAILED:
-      return "Association Failed";
-    case ABORTED:
-      return "Aborted";
-    case UNRECOVERABLE_ERROR:
-      return "Unrecoverable Error";
-    default:
-      NOTREACHED();
-      return std::string();
-  }
-}
-
 }  // namespace browser_sync