| Index: device/bluetooth/dbus/bluetooth_profile_service_provider.cc
|
| diff --git a/device/bluetooth/dbus/bluetooth_profile_service_provider.cc b/device/bluetooth/dbus/bluetooth_profile_service_provider.cc
|
| index 57750f8f80fd030be0ab72409da6609c4aede265..b3dc805a0764d9d48ca7a35b7e4d22542d597631 100644
|
| --- a/device/bluetooth/dbus/bluetooth_profile_service_provider.cc
|
| +++ b/device/bluetooth/dbus/bluetooth_profile_service_provider.cc
|
| @@ -103,10 +103,9 @@ class BluetoothProfileServiceProviderImpl
|
|
|
| dbus::MessageReader reader(method_call);
|
| dbus::ObjectPath device_path;
|
| - std::unique_ptr<dbus::FileDescriptor> fd(new dbus::FileDescriptor());
|
| + base::ScopedFD fd;
|
| dbus::MessageReader array_reader(NULL);
|
| - if (!reader.PopObjectPath(&device_path) ||
|
| - !reader.PopFileDescriptor(fd.get()) ||
|
| + if (!reader.PopObjectPath(&device_path) || !reader.PopFileDescriptor(&fd) ||
|
| !reader.PopArray(&array_reader)) {
|
| LOG(WARNING) << "NewConnection called with incorrect paramters: "
|
| << method_call->ToString();
|
|
|