Switch to standard integer types in device/.

device/bluetooth/test/mock_bluetooth_device.h

Index: device/bluetooth/test/mock_bluetooth_device.h
diff --git a/device/bluetooth/test/mock_bluetooth_device.h b/device/bluetooth/test/mock_bluetooth_device.h
index a19937c1c49e5216f5b40d88aad9459ec8dbdc66..5aab092196b03f0a4cc804e7c4ab6dd67336da69 100644
--- a/device/bluetooth/test/mock_bluetooth_device.h
+++ b/device/bluetooth/test/mock_bluetooth_device.h
@@ -5,6 +5,8 @@
 #ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
 #define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/memory/scoped_vector.h"
@@ -22,21 +24,21 @@ class MockBluetoothAdapter;
 class MockBluetoothDevice : public BluetoothDevice {
  public:
   MockBluetoothDevice(MockBluetoothAdapter* adapter,
-                      uint32 bluetooth_class,
+                      uint32_t bluetooth_class,
                       const std::string& name,
                       const std::string& address,
                       bool paired,
                       bool connected);
   virtual ~MockBluetoothDevice();
 
-  MOCK_CONST_METHOD0(GetBluetoothClass, uint32());
+  MOCK_CONST_METHOD0(GetBluetoothClass, uint32_t());
   MOCK_CONST_METHOD0(GetDeviceName, std::string());
   MOCK_CONST_METHOD0(GetIdentifier, std::string());
   MOCK_CONST_METHOD0(GetAddress, std::string());
   MOCK_CONST_METHOD0(GetVendorIDSource, BluetoothDevice::VendorIDSource());
-  MOCK_CONST_METHOD0(GetVendorID, uint16());
-  MOCK_CONST_METHOD0(GetProductID, uint16());
-  MOCK_CONST_METHOD0(GetDeviceID, uint16());
+  MOCK_CONST_METHOD0(GetVendorID, uint16_t());
+  MOCK_CONST_METHOD0(GetProductID, uint16_t());
+  MOCK_CONST_METHOD0(GetDeviceID, uint16_t());
   MOCK_CONST_METHOD0(GetName, base::string16());
   MOCK_CONST_METHOD0(GetDeviceType, BluetoothDevice::DeviceType());
   MOCK_CONST_METHOD0(IsPaired, bool());
@@ -45,8 +47,8 @@ class MockBluetoothDevice : public BluetoothDevice {
   MOCK_CONST_METHOD0(IsConnectable, bool());
   MOCK_CONST_METHOD0(IsConnecting, bool());
   MOCK_CONST_METHOD0(GetUUIDs, UUIDList());
-  MOCK_CONST_METHOD0(GetInquiryRSSI, int16());
-  MOCK_CONST_METHOD0(GetInquiryTxPower, int16());
+  MOCK_CONST_METHOD0(GetInquiryRSSI, int16_t());
+  MOCK_CONST_METHOD0(GetInquiryTxPower, int16_t());
   MOCK_CONST_METHOD0(ExpectingPinCode, bool());
   MOCK_CONST_METHOD0(ExpectingPasskey, bool());
   MOCK_CONST_METHOD0(ExpectingConfirmation, bool());
@@ -62,7 +64,7 @@ class MockBluetoothDevice : public BluetoothDevice {
            const base::Closure& callback,
            const BluetoothDevice::ConnectErrorCallback& error_callback));
   MOCK_METHOD1(SetPinCode, void(const std::string&));
-  MOCK_METHOD1(SetPasskey, void(uint32));
+  MOCK_METHOD1(SetPasskey, void(uint32_t));
   MOCK_METHOD0(ConfirmPairing, void());
   MOCK_METHOD0(RejectPairing, void());
   MOCK_METHOD0(CancelPairing, void());
@@ -102,7 +104,7 @@ class MockBluetoothDevice : public BluetoothDevice {
   BluetoothGattService* GetMockService(const std::string& identifier) const;
 
  private:
-  uint32 bluetooth_class_;
+  uint32_t bluetooth_class_;
   std::string name_;
   std::string address_;
   BluetoothDevice::UUIDList uuids_;