Switch to standard integer types in device/.

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 "base/bind.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/stl_util.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_manager.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace bluez {
 
 namespace {
@@ skipping 293 matching lines @@
 
   // Called when a response for successful method call is received.
   void OnSuccess(const base::Closure& callback, dbus::Response* response) {
     DCHECK(response);
     callback.Run();
   }
 
   // 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.";
       callback.Run(rssi, transmit_power, max_transmit_power);
       return;
     }
 
     dbus::MessageReader reader(response);
     if (!reader.PopInt16(&rssi) || !reader.PopInt16(&transmit_power) ||
         !reader.PopInt16(&max_transmit_power)) {
@@ skipping 35 matching lines @@
 
 BluetoothDeviceClient::BluetoothDeviceClient() {}
 
 BluetoothDeviceClient::~BluetoothDeviceClient() {}
 
 BluetoothDeviceClient* BluetoothDeviceClient::Create() {
   return new BluetoothDeviceClientImpl();
 }
 
 }  // namespace bluez