| Index: device/bluetooth/dbus/bluetooth_device_client.cc
|
| diff --git a/device/bluetooth/dbus/bluetooth_device_client.cc b/device/bluetooth/dbus/bluetooth_device_client.cc
|
| index 7aaafa2f5437fd6cd1d5b3558d519f0479cf7cda..11626f505a7be6f202afbdd338256831215fccb7 100644
|
| --- a/device/bluetooth/dbus/bluetooth_device_client.cc
|
| +++ b/device/bluetooth/dbus/bluetooth_device_client.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
| #include "base/stl_util.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/message.h"
|
| @@ -319,9 +320,9 @@ class BluetoothDeviceClientImpl : public BluetoothDeviceClient,
|
| // Called when a response for the GetConnInfo method is received.
|
| void OnGetConnInfoSuccess(const ConnInfoCallback& callback,
|
| dbus::Response* response) {
|
| - int16 rssi = kUnknownPower;
|
| - int16 transmit_power = kUnknownPower;
|
| - int16 max_transmit_power = kUnknownPower;
|
| + int16_t rssi = kUnknownPower;
|
| + int16_t transmit_power = kUnknownPower;
|
| + int16_t max_transmit_power = kUnknownPower;
|
|
|
| if (!response) {
|
| LOG(ERROR) << "GetConnInfo succeeded, but no response received.";
|
|
|