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

Unified Diff: device/bluetooth/test/mock_bluetooth_gatt_descriptor.h

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
Index: device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
diff --git a/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h b/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
index 8e17dd247cef546182a8dfe89e3557e03d73028e..e98a4c80ee88bff2b98bc5c1c61fb2ed53cd3f4a 100644
--- a/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
+++ b/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
@@ -5,11 +5,13 @@
#ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_DESCRIPTOR_H_
#define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_DESCRIPTOR_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/macros.h"
#include "device/bluetooth/bluetooth_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_gatt_descriptor.h"
#include "device/bluetooth/bluetooth_uuid.h"
@@ -32,14 +34,14 @@ class MockBluetoothGattDescriptor : public BluetoothGattDescriptor {
MOCK_CONST_METHOD0(GetIdentifier, std::string());
MOCK_CONST_METHOD0(GetUUID, BluetoothUUID());
MOCK_CONST_METHOD0(IsLocal, bool());
- MOCK_CONST_METHOD0(GetValue, const std::vector<uint8>&());
+ MOCK_CONST_METHOD0(GetValue, const std::vector<uint8_t>&());
MOCK_CONST_METHOD0(GetCharacteristic, BluetoothGattCharacteristic*());
MOCK_CONST_METHOD0(GetPermissions,
BluetoothGattCharacteristic::Permissions());
MOCK_METHOD2(ReadRemoteDescriptor,
void(const ValueCallback&, const ErrorCallback&));
MOCK_METHOD3(WriteRemoteDescriptor,
- void(const std::vector<uint8>&,
+ void(const std::vector<uint8_t>&,
const base::Closure&,
const ErrorCallback&));
« no previous file with comments | « device/bluetooth/test/mock_bluetooth_gatt_characteristic.cc ('k') | device/bluetooth/test/mock_bluetooth_gatt_descriptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698