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

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

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.h
diff --git a/device/bluetooth/dbus/bluetooth_profile_service_provider.h b/device/bluetooth/dbus/bluetooth_profile_service_provider.h
index fa29216bcdc368ef8453e913ce4415ff144f3e9b..9f6cf156a1aa61c7fe49549f587fefa20b787070 100644
--- a/device/bluetooth/dbus/bluetooth_profile_service_provider.h
+++ b/device/bluetooth/dbus/bluetooth_profile_service_provider.h
@@ -11,9 +11,9 @@
#include <string>
#include "base/callback.h"
+#include "base/files/scoped_file.h"
#include "base/macros.h"
#include "dbus/bus.h"
-#include "dbus/file_descriptor.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
@@ -75,15 +75,10 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothProfileServiceProvider {
// A file descriptor for the connection socket is provided in |fd|, and
// details about the specific implementation of the profile in |options|.
//
- // IMPORTANT: Ownership of the file descriptor object |fd| is passed to
- // the delegate by this call. The delegate is responsible for checking the
- // validity of |fd| on a thread where I/O is permitted before taking the
- // value. If the value is not taken, the file descriptor is closed.
- //
// Ownership of |options| is NOT passed so information out of it must be
// copied if required.
virtual void NewConnection(const dbus::ObjectPath& device_path,
- std::unique_ptr<dbus::FileDescriptor> fd,
+ base::ScopedFD fd,
const Options& options,
const ConfirmationCallback& callback) = 0;

Powered by Google App Engine
This is Rietveld 408576698