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

chromeos/network/onc/onc_translator_shill_to_onc.cc

 // Copyright (c) 2012 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 <string>
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 namespace chromeos {
 namespace onc {
 
 namespace {
 
 // Converts |str| to a base::Value of the given |type|. If the conversion fails,
 // returns NULL.
 std::unique_ptr<base::Value> ConvertStringToValue(const std::string& str,
                                                   base::Value::Type type) {
   std::unique_ptr<base::Value> value;
-  if (type == base::Value::TYPE_STRING) {
+  if (type == base::Value::Type::STRING) {
     value.reset(new base::StringValue(str));
   } else {
     value = base::JSONReader::Read(str);
   }
   if (value && value->GetType() != type)
     return nullptr;
 
   return value;
 }
 
@@ skipping 619 matching lines @@
     onc_object_->SetWithoutPathExpansion(onc_dictionary_name, nested);
   }
   nested->SetWithoutPathExpansion(onc_field_name, value.DeepCopy());
 }
 
 void ShillToONCTranslator::TranslateAndAddListOfObjects(
     const std::string& onc_field_name,
     const base::ListValue& list) {
   const OncFieldSignature* field_signature =
       GetFieldSignature(*onc_signature_, onc_field_name);
-  if (field_signature->value_signature->onc_type != base::Value::TYPE_LIST) {
+  if (field_signature->value_signature->onc_type != base::Value::Type::LIST) {
     LOG(ERROR) << "ONC Field name: '" << onc_field_name << "' has type '"
                << field_signature->value_signature->onc_type
-               << "', expected: base::Value::TYPE_LIST: " << GetName();
+               << "', expected: base::Value::Type::LIST: " << GetName();
     return;
   }
   DCHECK(field_signature->value_signature->onc_array_entry_signature);
   std::unique_ptr<base::ListValue> result(new base::ListValue());
   for (base::ListValue::const_iterator it = list.begin(); it != list.end();
        ++it) {
     const base::DictionaryValue* shill_value = NULL;
     if (!(*it)->GetAsDictionary(&shill_value))
       continue;
     ShillToONCTranslator nested_translator(
@@ skipping 89 matching lines @@
     const NetworkState* network_state) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, onc_source, *onc_signature,
                                   network_state);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos