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

Unified Diff: components/proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc

Issue 1292263002: bluetooth: Create base class BluetoothDevice::CreateGattConnection impl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-adapter-
Patch Set: fix ProximityAuthBluetoothLowEnergyConnectionTest Created 5 years, 3 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
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_classic_device_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc
diff --git a/components/proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc b/components/proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc
index d56c167734137504665ff3edffaca1504302ddb6..df56f1f15d9562272d664ad3456c3a38b59eeea1 100644
--- a/components/proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc
+++ b/components/proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc
@@ -134,10 +134,6 @@ class ProximityAuthBluetoothLowEnergyConnectionTest : public testing::Test {
to_peripheral_char_uuid_(device::BluetoothUUID(kToPeripheralCharUUID)),
from_peripheral_char_uuid_(
device::BluetoothUUID(kFromPeripheralCharUUID)),
- gatt_connection_(new NiceMock<device::MockBluetoothGattConnection>(
- adapter_,
- kBluetoothAddress)),
- gatt_connection_alias_(gatt_connection_.get()),
notify_session_alias_(NULL),
bluetooth_throttler_(new NiceMock<MockBluetoothThrottler>),
task_runner_(new base::TestSimpleTaskRunner) {}
@@ -165,6 +161,8 @@ class ProximityAuthBluetoothLowEnergyConnectionTest : public testing::Test {
std::vector<const device::BluetoothDevice*> devices;
devices.push_back(device_.get());
ON_CALL(*adapter_, GetDevices()).WillByDefault(Return(devices));
+ ON_CALL(*adapter_, GetDevice(kBluetoothAddress))
+ .WillByDefault(Return(device_.get()));
ON_CALL(*device_, GetGattService(kServiceID))
.WillByDefault(Return(service_.get()));
ON_CALL(*service_, GetCharacteristic(kFromPeripheralCharID))
@@ -357,8 +355,6 @@ class ProximityAuthBluetoothLowEnergyConnectionTest : public testing::Test {
device::BluetoothUUID service_uuid_;
device::BluetoothUUID to_peripheral_char_uuid_;
device::BluetoothUUID from_peripheral_char_uuid_;
- scoped_ptr<device::MockBluetoothGattConnection> gatt_connection_;
- device::MockBluetoothGattConnection* gatt_connection_alias_;
scoped_ptr<device::MockBluetoothDevice> device_;
scoped_ptr<device::MockBluetoothGattService> service_;
scoped_ptr<device::MockBluetoothGattCharacteristic> to_peripheral_char_;
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_classic_device_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698