dbus: No dbus::FileDescriptor in BluetoothProfileServiceProvider

device/bluetooth/bluez/bluetooth_socket_bluez.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_SOCKET_BLUEZ_H_
 #define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_SOCKET_BLUEZ_H_
 
 #include <memory>
 #include <queue>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_export.h"
 #include "device/bluetooth/bluetooth_socket.h"
 #include "device/bluetooth/bluetooth_socket_net.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #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;
 class BluetoothAdapterBlueZ;
 class BluetoothAdapterProfileBlueZ;
 
 // The BluetoothSocketBlueZ class implements BluetoothSocket for platforms that
 // use BlueZ.
 //
 // This class is not thread-safe, but is only called from the UI thread.
@@ skipping 70 matching lines @@
 
   // Called by dbus:: on completion of the RegisterProfile() method call
   // triggered as a result of the adapter becoming present again.
   void OnInternalRegisterProfile(BluetoothAdapterProfileBlueZ* profile);
   void OnInternalRegisterProfileError(const std::string& error_message);
 
   // bluez::BluetoothProfileServiceProvider::Delegate:
   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,
                             const ConfirmationCallback& callback) override;
   void Cancel() override;
 
   // Method run to accept a single incoming connection.
   void AcceptConnectionRequest();
 
   // Method run on the socket thread to validate the file descriptor of a new
   // 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);
 
   // Method run on the UI thread after a new connection has been accepted and
   // a socket allocated in |socket|. Takes care of calling the Accept()
   // callback and |callback| with the right arguments based on |status|.
   void OnNewConnection(scoped_refptr<BluetoothSocket> socket,
                        const ConfirmationCallback& callback,
                        Status status);
 
   // 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();
 
   // Unregisters this socket's usage of the Bluetooth profile which cleans up
   // the profile if no one is using it.
   void UnregisterProfile();
 
   // Adapter the profile is registered against
   scoped_refptr<device::BluetoothAdapter> adapter_;
@@ skipping 21 matching lines @@
     ErrorCompletionCallback error_callback;
   };
   std::unique_ptr<AcceptRequest> accept_request_;
 
   // Queue of incoming connection requests.
   struct ConnectionRequest {
     ConnectionRequest();
     ~ConnectionRequest();
 
     dbus::ObjectPath device_path;
-    std::unique_ptr<dbus::FileDescriptor> fd;
+    base::ScopedFD fd;
     bluez::BluetoothProfileServiceProvider::Delegate::Options options;
     ConfirmationCallback callback;
     bool accepting;
     bool cancelled;
   };
   std::queue<linked_ptr<ConnectionRequest>> connection_request_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothSocketBlueZ);
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_SOCKET_BLUEZ_H_