| Index: chromeos/dbus/experimental_bluetooth_profile_service_provider.cc
|
| diff --git a/chromeos/dbus/experimental_bluetooth_profile_service_provider.cc b/chromeos/dbus/experimental_bluetooth_profile_service_provider.cc
|
| index a58c8bc8992be3025994b6b67c530fe0c53aff6a..2b2384ff06e7102e8ebdf3b38382f08f240815f3 100644
|
| --- a/chromeos/dbus/experimental_bluetooth_profile_service_provider.cc
|
| +++ b/chromeos/dbus/experimental_bluetooth_profile_service_provider.cc
|
| @@ -113,10 +113,10 @@ class ExperimentalBluetoothProfileServiceProviderImpl
|
|
|
| dbus::MessageReader reader(method_call);
|
| dbus::ObjectPath device_path;
|
| - dbus::FileDescriptor fd;
|
| + scoped_ptr<dbus::FileDescriptor> fd(new dbus::FileDescriptor());
|
| dbus::MessageReader array_reader(NULL);
|
| if (!reader.PopObjectPath(&device_path) ||
|
| - !reader.PopFileDescriptor(&fd) ||
|
| + !reader.PopFileDescriptor(fd.get()) ||
|
| !reader.PopArray(&array_reader)) {
|
| LOG(WARNING) << "NewConnection called with incorrect paramters: "
|
| << method_call->ToString();
|
| @@ -145,9 +145,7 @@ class ExperimentalBluetoothProfileServiceProviderImpl
|
| method_call,
|
| response_sender);
|
|
|
| - delegate_->NewConnection(device_path, &fd, options, callback);
|
| -
|
| - response_sender.Run(dbus::Response::FromMethodCall(method_call));
|
| + delegate_->NewConnection(device_path, fd.Pass(), options, callback);
|
| }
|
|
|
| // Called by dbus:: when the Bluetooth daemon is about to disconnect the
|
|
|