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

trunk/src/components/sync_driver/data_type_manager.cc

Index: trunk/src/components/sync_driver/data_type_manager.cc
===================================================================
--- trunk/src/components/sync_driver/data_type_manager.cc	(revision 289114)
+++ trunk/src/components/sync_driver/data_type_manager.cc	(working copy)
@@ -10,10 +10,25 @@
     : status(UNKNOWN) {
 }
 
+DataTypeManager::ConfigureResult::ConfigureResult(ConfigureStatus status,
+                                                  syncer::ModelTypeSet
+                                                      requested_types)
+    : status(status),
+      requested_types(requested_types) {
+  DCHECK_EQ(OK, status);
+}
+
 DataTypeManager::ConfigureResult::ConfigureResult(
     ConfigureStatus status,
-    syncer::ModelTypeSet requested_types)
-    : status(status), requested_types(requested_types) {
+    syncer::ModelTypeSet requested_types,
+    std::map<syncer::ModelType, syncer::SyncError> failed_data_types,
+    syncer::ModelTypeSet unfinished_data_types,
+    syncer::ModelTypeSet needs_crypto)
+    : status(status),
+      requested_types(requested_types),
+      failed_data_types(failed_data_types),
+      unfinished_data_types(unfinished_data_types),
+      needs_crypto(needs_crypto) {
 }
 
 DataTypeManager::ConfigureResult::~ConfigureResult() {
@@ -28,11 +43,12 @@
       return "Aborted";
     case UNRECOVERABLE_ERROR:
       return "Unrecoverable Error";
-    case UNKNOWN:
+    case PARTIAL_SUCCESS:
+      return "Partial Success";
+    default:
       NOTREACHED();
       return std::string();
   }
-  return std::string();
 }
 
 }  // namespace sync_driver