| Index: components/bookmarks/browser/bookmark_codec.cc
|
| diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
|
| index 1d6ff890bb6259ce8930a0697650f23f17fdd21c..eadb6660cb066feca11059d0f7538739730f3a34 100644
|
| --- a/components/bookmarks/browser/bookmark_codec.cc
|
| +++ b/components/bookmarks/browser/bookmark_codec.cc
|
| @@ -177,7 +177,7 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
|
|
|
| const base::Value* checksum_value;
|
| if (d_value->Get(kChecksumKey, &checksum_value)) {
|
| - if (checksum_value->GetType() != base::Value::TYPE_STRING)
|
| + if (checksum_value->GetType() != base::Value::Type::STRING)
|
| return false;
|
| if (!checksum_value->GetAsString(&stored_checksum_))
|
| return false;
|
| @@ -333,7 +333,7 @@ bool BookmarkCodec::DecodeNode(const base::DictionaryValue& value,
|
| if (!value.Get(kChildrenKey, &child_values))
|
| return false;
|
|
|
| - if (child_values->GetType() != base::Value::TYPE_LIST)
|
| + if (child_values->GetType() != base::Value::Type::LIST)
|
| return false;
|
|
|
| if (!node) {
|
| @@ -395,7 +395,7 @@ bool BookmarkCodec::DecodeMetaInfo(const base::DictionaryValue& value,
|
|
|
| // Meta info used to be stored as a serialized dictionary, so attempt to
|
| // parse the value as one.
|
| - if (meta_info->IsType(base::Value::TYPE_STRING)) {
|
| + if (meta_info->IsType(base::Value::Type::STRING)) {
|
| std::string meta_info_str;
|
| meta_info->GetAsString(&meta_info_str);
|
| JSONStringValueDeserializer deserializer(meta_info_str);
|
| @@ -433,11 +433,11 @@ void BookmarkCodec::DecodeMetaInfoHelper(
|
| const std::string& prefix,
|
| BookmarkNode::MetaInfoMap* meta_info_map) {
|
| for (base::DictionaryValue::Iterator it(dict); !it.IsAtEnd(); it.Advance()) {
|
| - if (it.value().IsType(base::Value::TYPE_DICTIONARY)) {
|
| + if (it.value().IsType(base::Value::Type::DICTIONARY)) {
|
| const base::DictionaryValue* subdict;
|
| it.value().GetAsDictionary(&subdict);
|
| DecodeMetaInfoHelper(*subdict, prefix + it.key() + ".", meta_info_map);
|
| - } else if (it.value().IsType(base::Value::TYPE_STRING)) {
|
| + } else if (it.value().IsType(base::Value::Type::STRING)) {
|
| it.value().GetAsString(&(*meta_info_map)[prefix + it.key()]);
|
| }
|
| }
|
|
|