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

components/policy/core/common/registry_dict.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 "components/policy/core/common/registry_dict.h"
 
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
@@ skipping 57 matching lines @@
       }
       return std::move(result);
     }
     return value.CreateDeepCopy();
   }
 
   // Else, do some conversions to map windows registry data types to JSON types.
   std::string string_value;
   int int_value = 0;
   switch (schema.type()) {
-    case base::Value::TYPE_NULL: {
+    case base::Value::Type::NONE: {
       return base::Value::CreateNullValue();
     }
-    case base::Value::TYPE_BOOLEAN: {
+    case base::Value::Type::BOOLEAN: {
       // Accept booleans encoded as either string or integer.
       if (value.GetAsInteger(&int_value) ||
           (value.GetAsString(&string_value) &&
            base::StringToInt(string_value, &int_value))) {
         return std::unique_ptr<base::Value>(
             new base::FundamentalValue(int_value != 0));
       }
       break;
     }
-    case base::Value::TYPE_INTEGER: {
+    case base::Value::Type::INTEGER: {
       // Integers may be string-encoded.
       if (value.GetAsString(&string_value) &&
           base::StringToInt(string_value, &int_value)) {
         return std::unique_ptr<base::Value>(
             new base::FundamentalValue(int_value));
       }
       break;
     }
-    case base::Value::TYPE_DOUBLE: {
+    case base::Value::Type::DOUBLE: {
       // Doubles may be string-encoded or integer-encoded.
       double double_value = 0;
       if (value.GetAsDouble(&double_value) ||
           (value.GetAsString(&string_value) &&
            base::StringToDouble(string_value, &double_value))) {
         return std::unique_ptr<base::Value>(
             new base::FundamentalValue(double_value));
       }
       break;
     }
-    case base::Value::TYPE_LIST: {
+    case base::Value::Type::LIST: {
       // Lists are encoded as subkeys with numbered value in the registry
       // (non-numerical keys are ignored).
       const base::DictionaryValue* dict = nullptr;
       if (value.GetAsDictionary(&dict)) {
         std::unique_ptr<base::ListValue> result(new base::ListValue());
         for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd();
              it.Advance()) {
           if (!IsKeyNumerical(it.key()))
             continue;
           std::unique_ptr<base::Value> converted =
               ConvertValue(it.value(), schema.GetItems());
           if (converted)
             result->Append(std::move(converted));
         }
         return std::move(result);
       }
       // Fall through in order to accept lists encoded as JSON strings.
     }
-    case base::Value::TYPE_DICTIONARY: {
+    case base::Value::Type::DICTIONARY: {
       // Dictionaries may be encoded as JSON strings.
       if (value.GetAsString(&string_value)) {
         std::unique_ptr<base::Value> result =
             base::JSONReader::Read(string_value);
         if (result && result->IsType(schema.type()))
           return result;
       }
       break;
     }
-    case base::Value::TYPE_STRING:
-    case base::Value::TYPE_BINARY:
+    case base::Value::Type::STRING:
+    case base::Value::Type::BINARY:
       // No conversion possible.
       break;
   }
 
   LOG(WARNING) << "Failed to convert " << value.GetType()
                << " to " << schema.type();
   return nullptr;
 }
 #endif  // #if defined(OS_WIN)
 
@@ skipping 148 matching lines @@
     std::string name(base::UTF16ToUTF8(it.Name()));
     std::unique_ptr<RegistryDict> subdict(new RegistryDict());
     subdict->ReadRegistry(hive, root + L"\\" + it.Name());
     SetKey(name, std::move(subdict));
   }
 }
 
 std::unique_ptr<base::Value> RegistryDict::ConvertToJSON(
     const Schema& schema) const {
   base::Value::Type type =
-      schema.valid() ? schema.type() : base::Value::TYPE_DICTIONARY;
+      schema.valid() ? schema.type() : base::Value::Type::DICTIONARY;
   switch (type) {
-    case base::Value::TYPE_DICTIONARY: {
+    case base::Value::Type::DICTIONARY: {
       std::unique_ptr<base::DictionaryValue> result(
           new base::DictionaryValue());
       for (RegistryDict::ValueMap::const_iterator entry(values_.begin());
            entry != values_.end(); ++entry) {
         Schema subschema =
             schema.valid() ? schema.GetProperty(entry->first) : Schema();
         std::unique_ptr<base::Value> converted =
             ConvertValue(*entry->second, subschema);
         if (converted)
           result->SetWithoutPathExpansion(entry->first, converted.release());
       }
       for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
            entry != keys_.end(); ++entry) {
         Schema subschema =
             schema.valid() ? schema.GetProperty(entry->first) : Schema();
         std::unique_ptr<base::Value> converted =
             entry->second->ConvertToJSON(subschema);
         if (converted)
           result->SetWithoutPathExpansion(entry->first, converted.release());
       }
       return std::move(result);
     }
-    case base::Value::TYPE_LIST: {
+    case base::Value::Type::LIST: {
       std::unique_ptr<base::ListValue> result(new base::ListValue());
       Schema item_schema = schema.valid() ? schema.GetItems() : Schema();
       for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
            entry != keys_.end(); ++entry) {
         if (!IsKeyNumerical(entry->first))
           continue;
         std::unique_ptr<base::Value> converted =
             entry->second->ConvertToJSON(item_schema);
         if (converted)
           result->Append(std::move(converted));
@@ skipping 10 matching lines @@
       return std::move(result);
     }
     default:
       LOG(WARNING) << "Can't convert registry key to schema type " << type;
   }
 
   return nullptr;
 }
 #endif  // #if defined(OS_WIN)
 }  // namespace policy