| 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 23cb8642e3d6ab264d1e91212938b641d3572a16..5311fed5e4b9f3a3d4c3d1ba7686c2f379f9595d 100644
|
| --- a/chrome/browser/sync/syncable/model_type.cc
|
| +++ b/chrome/browser/sync/syncable/model_type.cc
|
| @@ -256,11 +256,11 @@ std::string ModelTypeSetToString(const ModelTypeSet& model_types) {
|
| }
|
|
|
| ModelType ModelTypeFromValue(const Value& value) {
|
| - if (value.IsType(Value::TYPE_STRING)) {
|
| + if (value.IsString()) {
|
| std::string result;
|
| CHECK(value.GetAsString(&result));
|
| return ModelTypeFromString(result);
|
| - } else if (value.IsType(Value::TYPE_INTEGER)) {
|
| + } else if (value.IsInteger()) {
|
| int result;
|
| CHECK(value.GetAsInteger(&result));
|
| return ModelTypeFromInt(result);
|
|
|