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

third_party/libaddressinput/chromium/json.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 "third_party/libaddressinput/src/cpp/src/util/json.h"
 
 #include <map>
 #include <memory>
 
 #include "base/json/json_reader.h"
@@ skipping 11 matching lines @@
 // parsing failed.
 ::std::unique_ptr<const base::DictionaryValue> Parse(const std::string& json,
                                                      bool* parser_error) {
   DCHECK(parser_error);
   ::std::unique_ptr<const base::DictionaryValue> result;
 
   // |json| is converted to a |c_str()| here because rapidjson and other parts
   // of the standalone library use char* rather than std::string.
   ::std::unique_ptr<const base::Value> parsed(
       base::JSONReader::Read(json.c_str()));
-  *parser_error = !parsed || !parsed->IsType(base::Value::TYPE_DICTIONARY);
+  *parser_error = !parsed || !parsed->IsType(base::Value::Type::DICTIONARY);
 
   if (*parser_error)
     result.reset(new base::DictionaryValue);
   else
     result.reset(static_cast<const base::DictionaryValue*>(parsed.release()));
 
   return result;
 }
 
 }  // namespace
 
 // Implementation of JSON parser for libaddressinput using JSON parser in
 // Chrome.
 class Json::JsonImpl {
  public:
   explicit JsonImpl(const std::string& json)
       : owned_(Parse(json, &parser_error_)),
         dict_(*owned_) {}
 
   ~JsonImpl() {}
 
   bool parser_error() const { return parser_error_; }
 
   const std::vector<const Json*>& GetSubDictionaries() {
     if (sub_dicts_.empty()) {
       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* sub_dict = NULL;
           it.value().GetAsDictionary(&sub_dict);
           owned_sub_dicts_.push_back(
               base::WrapUnique(new Json(new JsonImpl(*sub_dict))));
           sub_dicts_.push_back(owned_sub_dicts_.back().get());
         }
       }
     }
     return sub_dicts_;
   }
@@ skipping 33 matching lines @@
 
 bool Json::GetStringValueForKey(const std::string& key,
                                 std::string* value) const {
   return impl_->GetStringValueForKey(key, value);
 }
 
 Json::Json(JsonImpl* impl) : impl_(impl) {}
 
 }  // namespace addressinput
 }  // namespace i18n