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

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

Issue 1898643002: Refactor device::BluetoothGattXXX classes to split into remote/local. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor cleanup Created 4 years, 8 months 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 e98a4c80ee88bff2b98bc5c1c61fb2ed53cd3f4a..f0a0430f421bea821debdce5b9385199d568f17e 100644
--- a/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
+++ b/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
@@ -12,8 +12,8 @@
#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_remote_gatt_characteristic.h"
+#include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
#include "device/bluetooth/bluetooth_uuid.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -21,23 +21,23 @@ namespace device {
class MockBluetoothGattCharacteristic;
-class MockBluetoothGattDescriptor : public BluetoothGattDescriptor {
+class MockBluetoothGattDescriptor : public BluetoothRemoteGattDescriptor {
scheib 2016/04/20 01:23:30 Intentionally not using MockBluetoothRemoteGattDes
rkc 2016/04/20 16:31:54 This class isn't getting used anywhere. I've put a
public:
MockBluetoothGattDescriptor(
MockBluetoothGattCharacteristic* characteristic,
const std::string& identifier,
const BluetoothUUID& uuid,
bool is_local,
- BluetoothGattCharacteristic::Permissions permissions);
+ BluetoothRemoteGattCharacteristic::Permissions permissions);
virtual ~MockBluetoothGattDescriptor();
MOCK_CONST_METHOD0(GetIdentifier, std::string());
MOCK_CONST_METHOD0(GetUUID, BluetoothUUID());
MOCK_CONST_METHOD0(IsLocal, bool());
MOCK_CONST_METHOD0(GetValue, const std::vector<uint8_t>&());
- MOCK_CONST_METHOD0(GetCharacteristic, BluetoothGattCharacteristic*());
+ MOCK_CONST_METHOD0(GetCharacteristic, BluetoothRemoteGattCharacteristic*());
MOCK_CONST_METHOD0(GetPermissions,
- BluetoothGattCharacteristic::Permissions());
+ BluetoothRemoteGattCharacteristic::Permissions());
MOCK_METHOD2(ReadRemoteDescriptor,
void(const ValueCallback&, const ErrorCallback&));
MOCK_METHOD3(WriteRemoteDescriptor,

Powered by Google App Engine
This is Rietveld 408576698