Switch to standard integer types in device/.

device/bluetooth/bluetooth_device_android.cc

 // Copyright 2015 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/bluetooth_device_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 32 matching lines @@
 // static
 bool BluetoothDeviceAndroid::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(env);  // Generated in ChromeBluetoothDevice_jni.h
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 BluetoothDeviceAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(j_device_);
 }
 
-uint32 BluetoothDeviceAndroid::GetBluetoothClass() const {
+uint32_t BluetoothDeviceAndroid::GetBluetoothClass() const {
   return Java_ChromeBluetoothDevice_getBluetoothClass(AttachCurrentThread(),
                                                       j_device_.obj());
 }
 
 std::string BluetoothDeviceAndroid::GetAddress() const {
   return ConvertJavaStringToUTF8(Java_ChromeBluetoothDevice_getAddress(
       AttachCurrentThread(), j_device_.obj()));
 }
 
 BluetoothDevice::VendorIDSource BluetoothDeviceAndroid::GetVendorIDSource()
     const {
   // Android API does not provide Vendor ID.
   return VENDOR_ID_UNKNOWN;
 }
 
-uint16 BluetoothDeviceAndroid::GetVendorID() const {
+uint16_t BluetoothDeviceAndroid::GetVendorID() const {
   // Android API does not provide Vendor ID.
   return 0;
 }
 
-uint16 BluetoothDeviceAndroid::GetProductID() const {
+uint16_t BluetoothDeviceAndroid::GetProductID() const {
   // Android API does not provide Product ID.
   return 0;
 }
 
-uint16 BluetoothDeviceAndroid::GetDeviceID() const {
+uint16_t BluetoothDeviceAndroid::GetDeviceID() const {
   // Android API does not provide Device ID.
   return 0;
 }
 
 bool BluetoothDeviceAndroid::IsPaired() const {
   return Java_ChromeBluetoothDevice_isPaired(AttachCurrentThread(),
                                              j_device_.obj());
 }
 
 bool BluetoothDeviceAndroid::IsConnected() const {
@@ skipping 21 matching lines @@
       env, Java_ChromeBluetoothDevice_getUuids(env, j_device_.obj()).obj(),
       &uuid_strings);
   BluetoothDevice::UUIDList uuids;
   uuids.reserve(uuid_strings.size());
   for (auto uuid_string : uuid_strings) {
     uuids.push_back(BluetoothUUID(uuid_string));
   }
   return uuids;
 }
 
-int16 BluetoothDeviceAndroid::GetInquiryRSSI() const {
+int16_t BluetoothDeviceAndroid::GetInquiryRSSI() const {
   NOTIMPLEMENTED();
   return kUnknownPower;
 }
 
-int16 BluetoothDeviceAndroid::GetInquiryTxPower() const {
+int16_t BluetoothDeviceAndroid::GetInquiryTxPower() const {
   NOTIMPLEMENTED();
   return kUnknownPower;
 }
 
 bool BluetoothDeviceAndroid::ExpectingPinCode() const {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool BluetoothDeviceAndroid::ExpectingPasskey() const {
@@ skipping 16 matching lines @@
     PairingDelegate* pairing_delegate,
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceAndroid::SetPinCode(const std::string& pincode) {
   NOTIMPLEMENTED();
 }
 
-void BluetoothDeviceAndroid::SetPasskey(uint32 passkey) {
+void BluetoothDeviceAndroid::SetPasskey(uint32_t passkey) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceAndroid::ConfirmPairing() {
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceAndroid::RejectPairing() {
   NOTIMPLEMENTED();
 }
@@ skipping 94 matching lines @@
       AttachCurrentThread(), j_device_.obj(),
       base::android::GetApplicationContext());
 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
   Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(),
                                             j_device_.obj());
 }
 
 }  // namespace device