| Index: device/hid/hid_service_linux.h
|
| diff --git a/device/hid/hid_service_linux.h b/device/hid/hid_service_linux.h
|
| index 314a2496c37daf6f056bb728b22d477744d01f33..7972c80a782cc13c9a52eaeca0b98646e7cc5b34 100644
|
| --- a/device/hid/hid_service_linux.h
|
| +++ b/device/hid/hid_service_linux.h
|
| @@ -8,16 +8,13 @@
|
| #include <memory>
|
|
|
| #include "base/compiler_specific.h"
|
| +#include "base/files/scoped_file.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "build/build_config.h"
|
| #include "device/hid/hid_device_info.h"
|
| #include "device/hid/hid_service.h"
|
|
|
| -namespace dbus {
|
| -class FileDescriptor;
|
| -}
|
| -
|
| namespace device {
|
|
|
| class HidConnection;
|
| @@ -40,13 +37,11 @@ class HidServiceLinux : public HidService {
|
| // struct.
|
| #if defined(OS_CHROMEOS)
|
| static void OnPathOpenComplete(std::unique_ptr<ConnectParams> params,
|
| - dbus::FileDescriptor fd);
|
| + base::ScopedFD fd);
|
| static void OnPathOpenError(const std::string& device_path,
|
| const ConnectCallback& callback,
|
| const std::string& error_name,
|
| const std::string& error_message);
|
| - static void ValidateFdOnBlockingThread(std::unique_ptr<ConnectParams> params,
|
| - dbus::FileDescriptor fd);
|
| #else
|
| static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params);
|
| #endif
|
|
|