Index: device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc |
diff --git a/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc |
index 69a20d86f7e0e00072169466eec568cbf9f16a4b..707b5a45800d99b99f2eac00dc22d1f596229312 100644 |
--- a/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc |
+++ b/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc |
@@ -97,13 +97,12 @@ class BluetoothAdapterProfileBlueZTest : public testing::Test { |
void NewConnection( |
const dbus::ObjectPath& device_path, |
- std::unique_ptr<dbus::FileDescriptor> fd, |
+ base::ScopedFD fd, |
const bluez::BluetoothProfileServiceProvider::Delegate::Options& |
options, |
const ConfirmationCallback& callback) override { |
++connections_; |
- fd->CheckValidity(); |
Rahul Chaturvedi
2016/09/06 23:01:19
We no longer care to check validity?
hashimoto
2016/09/07 05:55:17
This "validity" check was introduced to avoid send
|
- close(fd->TakeValue()); |
+ fd.reset(); |
callback.Run(SUCCESS); |
if (device_path_.value() != "") |
ASSERT_EQ(device_path_, device_path); |