dbus: No dbus::FileDescriptor in BluetoothProfileServiceProvider

device/bluetooth/bluez/bluetooth_socket_bluez.h

Index: device/bluetooth/bluez/bluetooth_socket_bluez.h
diff --git a/device/bluetooth/bluez/bluetooth_socket_bluez.h b/device/bluetooth/bluez/bluetooth_socket_bluez.h
index c08ad97c2b327b25e605710a10daaf484d08b248..9c484b49dcb1991677e5002f71f40b0401a66395 100644
--- a/device/bluetooth/bluez/bluetooth_socket_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_socket_bluez.h
@@ -20,10 +20,6 @@
 #include "device/bluetooth/dbus/bluetooth_profile_manager_client.h"
 #include "device/bluetooth/dbus/bluetooth_profile_service_provider.h"
 
-namespace dbus {
-class FileDescriptor;
-}  // namespace dbus
-
 namespace bluez {
 
 class BluetoothDeviceBlueZ;
@@ -114,7 +110,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothSocketBlueZ
   void Released() override;
   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;
   void RequestDisconnection(const dbus::ObjectPath& device_path,
@@ -128,7 +124,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothSocketBlueZ
   // connection and set up the underlying net::TCPSocket() for it.
   void DoNewConnection(
       const dbus::ObjectPath& device_path,
-      std::unique_ptr<dbus::FileDescriptor> fd,
+      base::ScopedFD fd,
       const bluez::BluetoothProfileServiceProvider::Delegate::Options& options,
       const ConfirmationCallback& callback);
 
@@ -142,8 +138,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothSocketBlueZ
   // Method run on the socket thread with a valid file descriptor |fd|, once
   // complete calls |callback| on the UI thread with an appropriate argument
   // indicating success or failure.
-  void DoConnect(std::unique_ptr<dbus::FileDescriptor> fd,
-                 const ConfirmationCallback& callback);
+  void DoConnect(base::ScopedFD fd, const ConfirmationCallback& callback);
 
   // Method run to clean-up a listening socket.
   void DoCloseListening();
@@ -185,7 +180,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothSocketBlueZ
     ~ConnectionRequest();
 
     dbus::ObjectPath device_path;
-    std::unique_ptr<dbus::FileDescriptor> fd;
+    base::ScopedFD fd;
     bluez::BluetoothProfileServiceProvider::Delegate::Options options;
     ConfirmationCallback callback;
     bool accepting;