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

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

Issue 1284073002: bluetooth: Add adapter to BluetoothDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-drop-callback-
Patch Set: Merge TOT 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
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 a3fc905133f03ca925d05f7271c9e5d9d8e06b5d..d56c167734137504665ff3edffaca1504302ddb6 100644
--- a/components/proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc
+++ b/components/proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc
@@ -135,6 +135,7 @@ class ProximityAuthBluetoothLowEnergyConnectionTest : public testing::Test {
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),
@@ -219,8 +220,9 @@ class ProximityAuthBluetoothLowEnergyConnectionTest : public testing::Test {
SaveArg<1>(&characteristics_finder_error_callback_),
Return(new NiceMock<MockBluetoothLowEnergyCharacteristicsFinder>)));
- create_gatt_connection_success_callback_.Run(make_scoped_ptr(
- new NiceMock<device::MockBluetoothGattConnection>(kBluetoothAddress)));
+ create_gatt_connection_success_callback_.Run(
+ make_scoped_ptr(new NiceMock<device::MockBluetoothGattConnection>(
+ adapter_, kBluetoothAddress)));
EXPECT_EQ(connection->sub_status(),
BluetoothLowEnergyConnection::SubStatus::WAITING_CHARACTERISTICS);
@@ -675,8 +677,9 @@ TEST_F(ProximityAuthBluetoothLowEnergyConnectionTest,
SaveArg<1>(&characteristics_finder_error_callback_),
Return(new NiceMock<MockBluetoothLowEnergyCharacteristicsFinder>)));
- create_gatt_connection_success_callback_.Run(make_scoped_ptr(
- new NiceMock<device::MockBluetoothGattConnection>(kBluetoothAddress)));
+ create_gatt_connection_success_callback_.Run(
+ make_scoped_ptr(new NiceMock<device::MockBluetoothGattConnection>(
+ adapter_, kBluetoothAddress)));
CharacteristicsFound(connection.get());
NotifySessionStarted(connection.get());

Powered by Google App Engine
This is Rietveld 408576698