| Index: chrome/browser/sync/syncable/model_type.cc
|
| diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc
|
| index 4bbadbf1d89dea9b037e941207dd965f228a18e7..66202755cca3d0d6a1044bdd4f9220b0edf38a4b 100644
|
| --- a/chrome/browser/sync/syncable/model_type.cc
|
| +++ b/chrome/browser/sync/syncable/model_type.cc
|
| @@ -339,9 +339,9 @@ ModelType ModelTypeFromString(const std::string& model_type_string) {
|
| return UNSPECIFIED;
|
| }
|
|
|
| -std::string ModelEnumSetToString(ModelEnumSet model_types) {
|
| +std::string ModelTypeSetToString(ModelTypeSet model_types) {
|
| std::string result;
|
| - for (ModelEnumSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
|
| + for (ModelTypeSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
|
| if (!result.empty()) {
|
| result += ", ";
|
| }
|
| @@ -350,17 +350,17 @@ std::string ModelEnumSetToString(ModelEnumSet model_types) {
|
| return result;
|
| }
|
|
|
| -base::ListValue* ModelEnumSetToValue(ModelEnumSet model_types) {
|
| +base::ListValue* ModelTypeSetToValue(ModelTypeSet model_types) {
|
| ListValue* value = new ListValue();
|
| - for (ModelEnumSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
|
| + for (ModelTypeSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
|
| value->Append(
|
| Value::CreateStringValue(ModelTypeToString(it.Get())));
|
| }
|
| return value;
|
| }
|
|
|
| -ModelEnumSet ModelEnumSetFromValue(const base::ListValue& value) {
|
| - ModelEnumSet result;
|
| +ModelTypeSet ModelTypeSetFromValue(const base::ListValue& value) {
|
| + ModelTypeSet result;
|
| for (ListValue::const_iterator i = value.begin(); i != value.end(); ++i) {
|
| result.Put(ModelTypeFromValue(**i));
|
| }
|
|
|