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

media/cdm/json_web_key.cc

 // Copyright 2013 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 "media/cdm/json_web_key.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 153 matching lines @@
 
 bool ExtractKeysFromJWKSet(const std::string& jwk_set,
                            KeyIdAndKeyPairs* keys,
                            MediaKeys::SessionType* session_type) {
   if (!base::IsStringASCII(jwk_set)) {
     DVLOG(1) << "Non ASCII JWK Set: " << jwk_set;
     return false;
   }
 
   std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(jwk_set));
-  if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
+  if (!root.get() || root->GetType() != base::Value::Type::DICTIONARY) {
     DVLOG(1) << "Not valid JSON: " << jwk_set << ", root: " << root.get();
     return false;
   }
 
   // Locate the set from the dictionary.
   base::DictionaryValue* dictionary =
       static_cast<base::DictionaryValue*>(root.get());
   base::ListValue* list_val = NULL;
   if (!dictionary->GetList(kKeysTag, &list_val)) {
     DVLOG(1) << "Missing '" << kKeysTag
@@ skipping 48 matching lines @@
 bool ExtractKeyIdsFromKeyIdsInitData(const std::string& input,
                                      KeyIdList* key_ids,
                                      std::string* error_message) {
   if (!base::IsStringASCII(input)) {
     error_message->assign("Non ASCII: ");
     error_message->append(ShortenTo64Characters(input));
     return false;
   }
 
   std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(input));
-  if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
+  if (!root.get() || root->GetType() != base::Value::Type::DICTIONARY) {
     error_message->assign("Not valid JSON: ");
     error_message->append(ShortenTo64Characters(input));
     return false;
   }
 
   // Locate the set from the dictionary.
   base::DictionaryValue* dictionary =
       static_cast<base::DictionaryValue*>(root.get());
   base::ListValue* list_val = NULL;
   if (!dictionary->GetList(kKeyIdsTag, &list_val)) {
@@ skipping 114 matching lines @@
   const std::string license_as_str(
       reinterpret_cast<const char*>(!license.empty() ? &license[0] : NULL),
       license.size());
   if (!base::IsStringASCII(license_as_str)) {
     DVLOG(1) << "Non ASCII license: " << license_as_str;
     return false;
   }
 
   std::unique_ptr<base::Value> root(
       base::JSONReader().ReadToValue(license_as_str));
-  if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
+  if (!root.get() || root->GetType() != base::Value::Type::DICTIONARY) {
     DVLOG(1) << "Not valid JSON: " << license_as_str;
     return false;
   }
 
   // Locate the set from the dictionary.
   base::DictionaryValue* dictionary =
       static_cast<base::DictionaryValue*>(root.get());
   base::ListValue* list_val = NULL;
   if (!dictionary->GetList(kKeyIdsTag, &list_val)) {
     DVLOG(1) << "Missing '" << kKeyIdsTag << "' parameter or not a list";
@@ skipping 20 matching lines @@
     DVLOG(1) << "Invalid '" << kKeyIdsTag << "' value: " << encoded_key;
     return false;
   }
 
   std::vector<uint8_t> result(decoded_string.begin(), decoded_string.end());
   first_key->swap(result);
   return true;
 }
 
 }  // namespace media