Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: device/bluetooth/bluetooth_bluez_unittest.cc

Issue 1542163002: Switch to standard integer types in device/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_audio_sink_bluez_unittest.cc ('k') | device/bluetooth/bluetooth_channel_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_bluez_unittest.cc
diff --git a/device/bluetooth/bluetooth_bluez_unittest.cc b/device/bluetooth/bluetooth_bluez_unittest.cc
index a01e73db478d3c4c662ae345b7d59f5dfd8b2fce..74287e06580b78fb14fd95c85c816162b4831066 100644
--- a/device/bluetooth/bluetooth_bluez_unittest.cc
+++ b/device/bluetooth/bluetooth_bluez_unittest.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/memory/scoped_vector.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
@@ -113,21 +116,21 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
QuitMessageLoop();
}
- void DisplayPasskey(BluetoothDevice* device, uint32 passkey) override {
+ void DisplayPasskey(BluetoothDevice* device, uint32_t passkey) override {
++call_count_;
++display_passkey_count_;
last_passkey_ = passkey;
QuitMessageLoop();
}
- void KeysEntered(BluetoothDevice* device, uint32 entered) override {
+ void KeysEntered(BluetoothDevice* device, uint32_t entered) override {
++call_count_;
++keys_entered_count_;
last_entered_ = entered;
QuitMessageLoop();
}
- void ConfirmPasskey(BluetoothDevice* device, uint32 passkey) override {
+ void ConfirmPasskey(BluetoothDevice* device, uint32_t passkey) override {
++call_count_;
++confirm_passkey_count_;
last_passkey_ = passkey;
@@ -148,8 +151,8 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
int keys_entered_count_;
int confirm_passkey_count_;
int authorize_pairing_count_;
- uint32 last_passkey_;
- uint32 last_entered_;
+ uint32_t last_passkey_;
+ uint32_t last_entered_;
std::string last_pincode_;
private:
« no previous file with comments | « device/bluetooth/bluetooth_audio_sink_bluez_unittest.cc ('k') | device/bluetooth/bluetooth_channel_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698