Make base::Value::TYPE a scoped enum.

components/bookmarks/browser/bookmark_codec.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/bookmarks/browser/bookmark_codec.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 159 matching lines @@
   const base::DictionaryValue* d_value = nullptr;
   if (!value.GetAsDictionary(&d_value))
     return false;  // Unexpected type.
 
   int version;
   if (!d_value->GetInteger(kVersionKey, &version) || version != kCurrentVersion)
     return false;  // Unknown version.
 
   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;
   }
 
   const base::Value* roots;
   if (!d_value->Get(kRootsKey, &roots))
     return false;  // No roots.
 
   const base::DictionaryValue* roots_d_value = nullptr;
@@ skipping 135 matching lines @@
     UpdateChecksumWithUrlNode(id_string, title, url_string);
   } else {
     std::string last_modified_date;
     if (!value.GetString(kDateModifiedKey, &last_modified_date))
       last_modified_date = base::Int64ToString(Time::Now().ToInternalValue());
 
     const base::Value* child_values;
     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) {
       node = new BookmarkNode(id, GURL());
     } else {
       // If a new node is not created, explicitly assign ID to the existing one.
       node->set_id(id);
     }
 
     node->set_type(BookmarkNode::FOLDER);
@@ skipping 41 matching lines @@
   meta_info_map->clear();
 
   const base::Value* meta_info;
   if (!value.Get(kMetaInfo, &meta_info))
     return true;
 
   std::unique_ptr<base::Value> deserialized_holder;
 
   // 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);
     deserialized_holder = deserializer.Deserialize(nullptr, nullptr);
     if (!deserialized_holder)
       return false;
     meta_info = deserialized_holder.get();
   }
   // meta_info is now either the kMetaInfo node, or the deserialized node if it
   // was stored as a string. Either way it should now be a (possibly nested)
@@ skipping 17 matching lines @@
   }
 
   return true;
 }
 
 void BookmarkCodec::DecodeMetaInfoHelper(
     const base::DictionaryValue& dict,
     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()]);
     }
   }
 }
 
 void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
                                 BookmarkNode* other_node,
                                 BookmarkNode* mobile_node) {
   maximum_id_ = 0;
   ReassignIDsHelper(bb_node);
@@ skipping 41 matching lines @@
   base::MD5Init(&md5_context_);
 }
 
 void BookmarkCodec::FinalizeChecksum() {
   base::MD5Digest digest;
   base::MD5Final(&digest, &md5_context_);
   computed_checksum_ = base::MD5DigestToBase16(digest);
 }
 
 }  // namespace bookmarks