Index: dbus/values_util.cc |
diff --git a/dbus/values_util.cc b/dbus/values_util.cc |
index bea7bea7462aa07012276638eaf3f081bb0b45ef..f127ea470a3f55e006692047ef8470ba4ba3a610 100644 |
--- a/dbus/values_util.cc |
+++ b/dbus/values_util.cc |
@@ -98,37 +98,37 @@ std::unique_ptr<base::Value> PopDataAsValue(MessageReader* reader) { |
case Message::BYTE: { |
uint8_t value = 0; |
if (reader->PopByte(&value)) |
- result = base::MakeUnique<base::FundamentalValue>(value); |
+ result = base::MakeUnique<base::Value>(value); |
break; |
} |
case Message::BOOL: { |
bool value = false; |
if (reader->PopBool(&value)) |
- result = base::MakeUnique<base::FundamentalValue>(value); |
+ result = base::MakeUnique<base::Value>(value); |
break; |
} |
case Message::INT16: { |
int16_t value = 0; |
if (reader->PopInt16(&value)) |
- result = base::MakeUnique<base::FundamentalValue>(value); |
+ result = base::MakeUnique<base::Value>(value); |
break; |
} |
case Message::UINT16: { |
uint16_t value = 0; |
if (reader->PopUint16(&value)) |
- result = base::MakeUnique<base::FundamentalValue>(value); |
+ result = base::MakeUnique<base::Value>(value); |
break; |
} |
case Message::INT32: { |
int32_t value = 0; |
if (reader->PopInt32(&value)) |
- result = base::MakeUnique<base::FundamentalValue>(value); |
+ result = base::MakeUnique<base::Value>(value); |
break; |
} |
case Message::UINT32: { |
uint32_t value = 0; |
if (reader->PopUint32(&value)) { |
- result = base::MakeUnique<base::FundamentalValue>( |
+ result = base::MakeUnique<base::Value>( |
static_cast<double>(value)); |
} |
break; |
@@ -138,7 +138,7 @@ std::unique_ptr<base::Value> PopDataAsValue(MessageReader* reader) { |
if (reader->PopInt64(&value)) { |
DLOG_IF(WARNING, !IsExactlyRepresentableByDouble(value)) << |
value << " is not exactly representable by double"; |
- result = base::MakeUnique<base::FundamentalValue>( |
+ result = base::MakeUnique<base::Value>( |
static_cast<double>(value)); |
} |
break; |
@@ -148,7 +148,7 @@ std::unique_ptr<base::Value> PopDataAsValue(MessageReader* reader) { |
if (reader->PopUint64(&value)) { |
DLOG_IF(WARNING, !IsExactlyRepresentableByDouble(value)) << |
value << " is not exactly representable by double"; |
- result = base::MakeUnique<base::FundamentalValue>( |
+ result = base::MakeUnique<base::Value>( |
static_cast<double>(value)); |
} |
break; |
@@ -156,7 +156,7 @@ std::unique_ptr<base::Value> PopDataAsValue(MessageReader* reader) { |
case Message::DOUBLE: { |
double value = 0; |
if (reader->PopDouble(&value)) |
- result = base::MakeUnique<base::FundamentalValue>(value); |
+ result = base::MakeUnique<base::Value>(value); |
break; |
} |
case Message::STRING: { |