| Index: device/hid/hid_service_linux.cc
|
| diff --git a/device/hid/hid_service_linux.cc b/device/hid/hid_service_linux.cc
|
| index 2d878310a493a586d7d274d4bee24a36ed757d68..848d1f145ffab3a6bb8e17835bd6bf612b6546a3 100644
|
| --- a/device/hid/hid_service_linux.cc
|
| +++ b/device/hid/hid_service_linux.cc
|
| @@ -254,12 +254,12 @@ void HidServiceLinux::Connect(const HidDeviceId& device_id,
|
|
|
| // static
|
| void HidServiceLinux::OnPathOpenComplete(std::unique_ptr<ConnectParams> params,
|
| - dbus::FileDescriptor fd) {
|
| + base::ScopedFD fd) {
|
| scoped_refptr<base::SingleThreadTaskRunner> file_task_runner =
|
| params->file_task_runner;
|
| - file_task_runner->PostTask(
|
| - FROM_HERE, base::Bind(&HidServiceLinux::ValidateFdOnBlockingThread,
|
| - base::Passed(¶ms), base::Passed(&fd)));
|
| + params->device_file = base::File(fd.release());
|
| + file_task_runner->PostTask(FROM_HERE, base::Bind(&HidServiceLinux::FinishOpen,
|
| + base::Passed(¶ms)));
|
| }
|
|
|
| // static
|
| @@ -272,17 +272,6 @@ void HidServiceLinux::OnPathOpenError(const std::string& device_path,
|
| callback.Run(nullptr);
|
| }
|
|
|
| -// static
|
| -void HidServiceLinux::ValidateFdOnBlockingThread(
|
| - std::unique_ptr<ConnectParams> params,
|
| - dbus::FileDescriptor fd) {
|
| - base::ThreadRestrictions::AssertIOAllowed();
|
| - fd.CheckValidity();
|
| - DCHECK(fd.is_valid());
|
| - params->device_file = base::File(fd.TakeValue());
|
| - FinishOpen(std::move(params));
|
| -}
|
| -
|
| #else
|
|
|
| // static
|
|
|