device/bluetooth/test/mock_bluetooth_gatt_characteristic.h - Issue 1542163002: Switch to standard integer types in device/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/test/mock_bluetooth_gatt_characteristic.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

« no previous file with comments | « device/bluetooth/test/mock_bluetooth_discovery_session.h ('k') | device/bluetooth/test/mock_bluetooth_gatt_characteristic.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/test/mock_bluetooth_gatt_characteristic.h

diff --git a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h

index 8789b8215b10f035ee38e7209f855839dd6a23f2..dc1a9bb0328e3def25ee9b976ab96441c01a1dd8 100644

--- a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h

+++ b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h

@@ -5,11 +5,13 @@

#ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_CHARACTERISTIC_H_

#define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_CHARACTERISTIC_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_uuid.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -33,7 +35,7 @@ class MockBluetoothGattCharacteristic : public BluetoothGattCharacteristic {

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(GetService, BluetoothGattService*());

MOCK_CONST_METHOD0(GetProperties, Properties());

MOCK_CONST_METHOD0(GetPermissions, Permissions());

@@ -42,13 +44,13 @@ class MockBluetoothGattCharacteristic : public BluetoothGattCharacteristic {

MOCK_CONST_METHOD1(GetDescriptor,

BluetoothGattDescriptor*(const std::string&));

MOCK_METHOD1(AddDescriptor, bool(BluetoothGattDescriptor*));

- MOCK_METHOD1(UpdateValue, bool(const std::vector<uint8>&));

+ MOCK_METHOD1(UpdateValue, bool(const std::vector<uint8_t>&));

MOCK_METHOD2(StartNotifySession,

void(const NotifySessionCallback&, const ErrorCallback&));

MOCK_METHOD2(ReadRemoteCharacteristic,

void(const ValueCallback&, const ErrorCallback&));

MOCK_METHOD3(WriteRemoteCharacteristic,

- void(const std::vector<uint8>&,

+ void(const std::vector<uint8_t>&,

const base::Closure&,

const ErrorCallback&));