| 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 460985a3f5eaf46a000ac8f4e411660aa9dab66c..1ebfd7d9f81e9cf345a2f0aea5e7ef1e7bce7edd 100644
|
| --- a/chrome/browser/sync/syncable/model_type.cc
|
| +++ b/chrome/browser/sync/syncable/model_type.cc
|
| @@ -234,14 +234,14 @@ std::string ModelTypeToString(ModelType model_type) {
|
|
|
| StringValue* ModelTypeToValue(ModelType model_type) {
|
| if (model_type >= syncable::FIRST_REAL_MODEL_TYPE) {
|
| - return Value::CreateStringValue(ModelTypeToString(model_type));
|
| + return base::StringValue::New(ModelTypeToString(model_type));
|
| } else if (model_type == syncable::TOP_LEVEL_FOLDER) {
|
| - return Value::CreateStringValue("Top-level folder");
|
| + return base::StringValue::New("Top-level folder");
|
| } else if (model_type == syncable::UNSPECIFIED) {
|
| - return Value::CreateStringValue("Unspecified");
|
| + return base::StringValue::New("Unspecified");
|
| }
|
| NOTREACHED();
|
| - return Value::CreateStringValue("");
|
| + return base::StringValue::New("");
|
| }
|
|
|
| std::string ModelTypeSetToString(const ModelTypeSet& model_types) {
|
| @@ -352,7 +352,7 @@ ListValue* ModelTypeBitSetToValue(const ModelTypeBitSet& model_types) {
|
| for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
|
| if (model_types[i]) {
|
| value->Append(
|
| - Value::CreateStringValue(ModelTypeToString(ModelTypeFromInt(i))));
|
| + base::StringValue::New(ModelTypeToString(ModelTypeFromInt(i))));
|
| }
|
| }
|
| return value;
|
| @@ -370,7 +370,7 @@ ListValue* ModelTypeSetToValue(const ModelTypeSet& model_types) {
|
| ListValue* value = new ListValue();
|
| for (ModelTypeSet::const_iterator i = model_types.begin();
|
| i != model_types.end(); ++i) {
|
| - value->Append(Value::CreateStringValue(ModelTypeToString(*i)));
|
| + value->Append(base::StringValue::New(ModelTypeToString(*i)));
|
| }
|
| return value;
|
| }
|
|
|