Index: chrome/browser/sync/glue/data_type_manager_impl.cc |
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc |
index ac953b33ca89213d32caac39a3dd7069ae2e3d05..b0ab8431bed3b9c96f61c5a04512ed1a848a0a23 100644 |
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc |
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc |
@@ -35,9 +35,10 @@ GenerateCryptoErrorsForTypes(syncer::ModelTypeSet encrypted_types) { |
FailedDataTypesHandler::TypeErrorMap crypto_errors; |
for (syncer::ModelTypeSet::Iterator iter = encrypted_types.First(); |
iter.Good(); iter.Inc()) { |
- crypto_errors[iter.Get()] = syncer::SyncError(FROM_HERE, |
- "Cryptographer not ready.", |
- iter.Get()); |
+ crypto_errors[iter.Get()] = syncer::SyncError( |
+ FROM_HERE, |
+ syncer::SyncError::CRYPTO_ERROR, |
+ iter.Get()); |
} |
return crypto_errors; |
} |
@@ -489,7 +490,7 @@ void DataTypeManagerImpl::Abort(ConfigureStatus status, |
DCHECK_NE(OK, status); |
std::map<syncer::ModelType, syncer::SyncError> errors; |
if (error.IsSet()) |
- errors[error.type()] = error; |
+ errors[error.model_type()] = error; |
ConfigureResult result(status, |
last_requested_types_, |
errors, |