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

Unified Diff: device/bluetooth/dbus/bluetooth_profile_service_provider.cc

Issue 2310883003: dbus: No dbus::FileDescriptor in BluetoothProfileServiceProvider (Closed)
Patch Set: Fix tests Created 4 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: 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();

Powered by Google App Engine
This is Rietveld 408576698