Remove base::FundamentalValue

device/bluetooth/dbus/bluetooth_device_client.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 "device/bluetooth/dbus/bluetooth_device_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 36 matching lines @@
     // Fall through.
     case bluez::BluetoothServiceAttributeValueBlueZ::INT: {
       switch (size) {
         // It doesn't matter what 'sign' the number is, only size.
         // Whenever we unpack this value, we will take the raw bits and
         // cast it back to the correct sign anyway.
         case 1:
           uint8_t byte;
           if (!struct_reader->PopVariantOfByte(&byte))
             return nullptr;
-          value = base::MakeUnique<base::FundamentalValue>(byte);
+          value = base::MakeUnique<base::Value>(byte);
           break;
         case 2:
           uint16_t short_val;
           if (!struct_reader->PopVariantOfUint16(&short_val))
             return nullptr;
-          value = base::MakeUnique<base::FundamentalValue>(short_val);
+          value = base::MakeUnique<base::Value>(short_val);
           break;
         case 4:
           uint32_t val;
           if (!struct_reader->PopVariantOfUint32(&val))
             return nullptr;
-          value = base::MakeUnique<base::FundamentalValue>(
-              static_cast<int32_t>(val));
+          value = base::MakeUnique<base::Value>(static_cast<int32_t>(val));
           break;
         case 8:
         // Fall through.
         // BlueZ should never be sending us this size at the moment since
         // the Android SDP records we will create from these raw records
         // don't have any fields which use this size. If we ever decide to
         // change this, this needs to get fixed.
         default:
           NOTREACHED();
       }
       break;
     }
     case bluez::BluetoothServiceAttributeValueBlueZ::UUID:
     // Fall through.
     case bluez::BluetoothServiceAttributeValueBlueZ::STRING:
     // Fall through.
     case bluez::BluetoothServiceAttributeValueBlueZ::URL: {
       std::string str;
       if (!struct_reader->PopVariantOfString(&str))
         return nullptr;
       value = base::MakeUnique<base::StringValue>(str);
       break;
     }
     case bluez::BluetoothServiceAttributeValueBlueZ::BOOL: {
       bool b;
       if (!struct_reader->PopVariantOfBool(&b))
         return nullptr;
-      value = base::MakeUnique<base::FundamentalValue>(b);
+      value = base::MakeUnique<base::Value>(b);
       break;
     }
     case bluez::BluetoothServiceAttributeValueBlueZ::SEQUENCE: {
       dbus::MessageReader variant_reader(nullptr);
       if (!struct_reader->PopVariant(&variant_reader))
         return nullptr;
       dbus::MessageReader array_reader(nullptr);
       if (!variant_reader.PopArray(&array_reader))
         return nullptr;
       std::unique_ptr<BluetoothServiceAttributeValueBlueZ::Sequence> sequence =
@@ skipping 458 matching lines @@
 
 BluetoothDeviceClient::BluetoothDeviceClient() {}
 
 BluetoothDeviceClient::~BluetoothDeviceClient() {}
 
 BluetoothDeviceClient* BluetoothDeviceClient::Create() {
   return new BluetoothDeviceClientImpl();
 }
 
 }  // namespace bluez