Remove base::FundamentalValue

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 65 matching lines @@
   int int_value = 0;
   switch (schema.type()) {
     case base::Value::Type::NONE: {
       return base::Value::CreateNullValue();
     }
     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));
+        return std::unique_ptr<base::Value>(new base::Value(int_value != 0));
       }
       break;
     }
     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));
+        return std::unique_ptr<base::Value>(new base::Value(int_value));
       }
       break;
     }
     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));
+        return std::unique_ptr<base::Value>(new base::Value(double_value));
       }
       break;
     }
     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();
@@ skipping 149 matching lines @@
                            base::UTF16ToUTF8(it.Value()))));
         continue;
       case REG_DWORD_LITTLE_ENDIAN:
       case REG_DWORD_BIG_ENDIAN:
         if (it.ValueSize() == sizeof(DWORD)) {
           DWORD dword_value = *(reinterpret_cast<const DWORD*>(it.Value()));
           if (it.Type() == REG_DWORD_BIG_ENDIAN)
             dword_value = base::NetToHost32(dword_value);
           else
             dword_value = base::ByteSwapToLE32(dword_value);
-          SetValue(name,
-                   std::unique_ptr<base::Value>(new base::FundamentalValue(
-                       static_cast<int>(dword_value))));
+          SetValue(name, std::unique_ptr<base::Value>(
+                             new base::Value(static_cast<int>(dword_value))));
           continue;
         }
       case REG_NONE:
       case REG_LINK:
       case REG_MULTI_SZ:
       case REG_RESOURCE_LIST:
       case REG_FULL_RESOURCE_DESCRIPTOR:
       case REG_RESOURCE_REQUIREMENTS_LIST:
       case REG_QWORD_LITTLE_ENDIAN:
         // Unsupported type, message gets logged below.
@@ skipping 66 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