Reland 87645 with clang fixes.

chrome/browser/sync/glue/data_type_manager.cc

Index: chrome/browser/sync/glue/data_type_manager.cc
diff --git a/chrome/browser/sync/glue/data_type_manager.cc b/chrome/browser/sync/glue/data_type_manager.cc
index 45b836efec4ad85621482b634a7250e0480205ce..d71e0a2b954cd360acdfc324b6277acc8c48e904 100644
--- a/chrome/browser/sync/glue/data_type_manager.cc
+++ b/chrome/browser/sync/glue/data_type_manager.cc
@@ -6,12 +6,45 @@
 
 namespace browser_sync {
 
-DataTypeManager::ConfigureResultWithErrorLocation::
-    ~ConfigureResultWithErrorLocation() {}
+DataTypeManager::ConfigureResult::ConfigureResult() {}
 
-DataTypeManager::ConfigureResultWithErrorLocation::
-    ConfigureResultWithErrorLocation()
-    : result(OK) {
+DataTypeManager::ConfigureResult::ConfigureResult(ConfigureStatus status,
+                                                  TypeSet requested_types)
+    : status(status),
+      requested_types(requested_types) {
+  DCHECK_EQ(OK, status);
+}
+
+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);
+}
+
+DataTypeManager::ConfigureResult::~ConfigureResult() {
+}
+
+// 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