| Index: device/bluetooth/bluetooth_adapter_unittest.cc
|
| diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
|
| index 8b7f86f1f5d9cd35eb4f5f0a1c68f0b3b6d876ff..834e42d1315f9d7e246d73b7482bffbce8f85bc2 100644
|
| --- a/device/bluetooth/bluetooth_adapter_unittest.cc
|
| +++ b/device/bluetooth/bluetooth_adapter_unittest.cc
|
| @@ -139,7 +139,6 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
|
| void AuthorizePairing(BluetoothDevice* device) override {}
|
| };
|
|
|
| -
|
| TEST(BluetoothAdapterTest, NoDefaultPairingDelegate) {
|
| scoped_refptr<BluetoothAdapter> adapter = new TestBluetoothAdapter();
|
|
|
| @@ -465,7 +464,8 @@ TEST_F(BluetoothTest, DiscoverySession) {
|
| EXPECT_TRUE(discovery_sessions_[0]->IsActive());
|
|
|
| ResetEventCounts();
|
| - discovery_sessions_[0]->Stop(GetCallback(), GetErrorCallback());
|
| + discovery_sessions_[0]->Stop(GetCallback(Call::EXPECTED),
|
| + GetErrorCallback(Call::NOT_EXPECTED));
|
| EXPECT_EQ(1, callback_count_);
|
| EXPECT_EQ(0, error_callback_count_);
|
| EXPECT_FALSE(adapter_->IsDiscovering());
|
| @@ -488,7 +488,7 @@ TEST_F(BluetoothTest, NoPermissions) {
|
| return;
|
| }
|
|
|
| - StartLowEnergyDiscoverySession();
|
| + StartLowEnergyDiscoverySessionExpectedToFail();
|
|
|
| EXPECT_EQ(0, callback_count_);
|
| EXPECT_EQ(1, error_callback_count_);
|
|
|