Index: dbus/values_util.cc |
diff --git a/dbus/values_util.cc b/dbus/values_util.cc |
index 4367791d4d46033481485af61b0950e9d56752c1..58b2b9ed7f7b9fe00674019b1c264cfb870631cc 100644 |
--- a/dbus/values_util.cc |
+++ b/dbus/values_util.cc |
@@ -98,38 +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>( |
- static_cast<double>(value)); |
+ result = base::MakeUnique<base::Value>(static_cast<double>(value)); |
} |
break; |
} |
@@ -138,8 +137,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>( |
- static_cast<double>(value)); |
+ result = base::MakeUnique<base::Value>(static_cast<double>(value)); |
} |
break; |
} |
@@ -148,15 +146,14 @@ 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>( |
- static_cast<double>(value)); |
+ result = base::MakeUnique<base::Value>(static_cast<double>(value)); |
} |
break; |
} |
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: { |