Switch to standard integer types in device/.

device/bluetooth/bluetooth_classic_device_mac.mm

 // 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/bluetooth_classic_device_mac.h"
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/hash.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "device/bluetooth/bluetooth_socket_mac.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
@@ skipping 19 matching lines @@
   for (IOBluetoothSDPDataElement* inner_element in inner_elements) {
     if ([inner_element getTypeDescriptor] == kBluetoothSDPDataElementTypeUUID) {
       sdp_uuid = [[inner_element getUUIDValue] getUUIDWithLength:16];
       break;
     }
   }
 
   if (!sdp_uuid)
     return BluetoothUUID();
 
-  const uint8* uuid_bytes = reinterpret_cast<const uint8*>([sdp_uuid bytes]);
+  const uint8_t* uuid_bytes =
+      reinterpret_cast<const uint8_t*>([sdp_uuid bytes]);
   std::string uuid_str = base::HexEncode(uuid_bytes, 16);
   DCHECK_EQ(uuid_str.size(), 32U);
   uuid_str.insert(8, "-");
   uuid_str.insert(13, "-");
   uuid_str.insert(18, "-");
   uuid_str.insert(23, "-");
   return BluetoothUUID(uuid_str);
 }
 
 }  // namespace
 
 BluetoothClassicDeviceMac::BluetoothClassicDeviceMac(
     BluetoothAdapterMac* adapter,
     IOBluetoothDevice* device)
     : BluetoothDeviceMac(adapter), device_([device retain]) {}
 
 BluetoothClassicDeviceMac::~BluetoothClassicDeviceMac() {
 }
 
-uint32 BluetoothClassicDeviceMac::GetBluetoothClass() const {
+uint32_t BluetoothClassicDeviceMac::GetBluetoothClass() const {
   return [device_ classOfDevice];
 }
 
 std::string BluetoothClassicDeviceMac::GetDeviceName() const {
   return base::SysNSStringToUTF8([device_ name]);
 }
 
 void BluetoothClassicDeviceMac::CreateGattConnectionImpl() {
   // Classic devices do not support GATT connection.
   DidFailToConnectGatt(ERROR_UNSUPPORTED_DEVICE);
 }
 
 void BluetoothClassicDeviceMac::DisconnectGatt() {}
 
 std::string BluetoothClassicDeviceMac::GetAddress() const {
   return GetDeviceAddress(device_);
 }
 
 BluetoothDevice::VendorIDSource BluetoothClassicDeviceMac::GetVendorIDSource()
     const {
   return VENDOR_ID_UNKNOWN;
 }
 
-uint16 BluetoothClassicDeviceMac::GetVendorID() const {
+uint16_t BluetoothClassicDeviceMac::GetVendorID() const {
   return 0;
 }
 
-uint16 BluetoothClassicDeviceMac::GetProductID() const {
+uint16_t BluetoothClassicDeviceMac::GetProductID() const {
   return 0;
 }
 
-uint16 BluetoothClassicDeviceMac::GetDeviceID() const {
+uint16_t BluetoothClassicDeviceMac::GetDeviceID() const {
   return 0;
 }
 
 bool BluetoothClassicDeviceMac::IsPaired() const {
   return [device_ isPaired];
 }
 
 bool BluetoothClassicDeviceMac::IsConnected() const {
   return [device_ isConnected];
 }
@@ skipping 19 matching lines @@
     if ([service_class_data getTypeDescriptor] ==
         kBluetoothSDPDataElementTypeDataElementSequence) {
       BluetoothUUID uuid = ExtractUuid(service_class_data);
       if (uuid.IsValid())
         uuids.push_back(uuid);
     }
   }
   return uuids;
 }
 
-int16 BluetoothClassicDeviceMac::GetInquiryRSSI() const {
+int16_t BluetoothClassicDeviceMac::GetInquiryRSSI() const {
   return kUnknownPower;
 }
 
-int16 BluetoothClassicDeviceMac::GetInquiryTxPower() const {
+int16_t BluetoothClassicDeviceMac::GetInquiryTxPower() const {
   NOTIMPLEMENTED();
   return kUnknownPower;
 }
 
 bool BluetoothClassicDeviceMac::ExpectingPinCode() const {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool BluetoothClassicDeviceMac::ExpectingPasskey() const {
@@ skipping 32 matching lines @@
     PairingDelegate* pairing_delegate,
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothClassicDeviceMac::SetPinCode(const std::string& pincode) {
   NOTIMPLEMENTED();
 }
 
-void BluetoothClassicDeviceMac::SetPasskey(uint32 passkey) {
+void BluetoothClassicDeviceMac::SetPasskey(uint32_t passkey) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothClassicDeviceMac::ConfirmPairing() {
   NOTIMPLEMENTED();
 }
 
 void BluetoothClassicDeviceMac::RejectPairing() {
   NOTIMPLEMENTED();
 }
@@ skipping 63 matching lines @@
   return power_level;
 }
 
 // static
 std::string BluetoothClassicDeviceMac::GetDeviceAddress(
     IOBluetoothDevice* device) {
   return CanonicalizeAddress(base::SysNSStringToUTF8([device addressString]));
 }
 
 }  // namespace device