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 63544c77e9f0d81293c2a39a2b272279379d92e0..1c2d533e3299bff84a30e435d54d6f87a8f77f6e 100644 |
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc |
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc |
@@ -272,7 +272,7 @@ bool DataTypeManagerImpl::ProcessReconfigure() { |
} |
void DataTypeManagerImpl::DownloadReady( |
- const syncable::ModelTypeSet& failed_configuration_types) { |
+ syncable::ModelEnumSet failed_configuration_types) { |
DCHECK_EQ(state_, DOWNLOAD_PENDING); |
// Ignore |failed_configuration_types| if we need to reconfigure |
@@ -281,12 +281,12 @@ void DataTypeManagerImpl::DownloadReady( |
return; |
} |
- if (!failed_configuration_types.empty()) { |
+ if (!failed_configuration_types.Empty()) { |
std::string error_msg = |
"Configuration failed for types " + |
- syncable::ModelTypeSetToString(failed_configuration_types); |
+ syncable::ModelEnumSetToString(failed_configuration_types); |
SyncError error(FROM_HERE, error_msg, |
- *failed_configuration_types.begin()); |
+ failed_configuration_types.First().Get()); |
Abort(UNRECOVERABLE_ERROR, error); |
return; |
} |