chromeos: Remove dbus::FileDescriptor from PermissionBrokerClient

device/usb/usb_device_linux.cc

Index: device/usb/usb_device_linux.cc
diff --git a/device/usb/usb_device_linux.cc b/device/usb/usb_device_linux.cc
index 3bc0bf98b7cd11fa328f9310b1ccef1399499a4e..01f033cdbcd86a0df62c6b091dd462c52e80f002 100644
--- a/device/usb/usb_device_linux.cc
+++ b/device/usb/usb_device_linux.cc
@@ -23,7 +23,6 @@
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/permission_broker_client.h"
-#include "dbus/file_descriptor.h"  // nogncheck
 #endif                             // defined(OS_CHROMEOS)
 
 namespace device {
@@ -88,10 +87,13 @@ void UsbDeviceLinux::Open(const OpenCallback& callback) {
 #if defined(OS_CHROMEOS)
 
 void UsbDeviceLinux::OnOpenRequestComplete(const OpenCallback& callback,
-                                           dbus::FileDescriptor fd) {
-  blocking_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&UsbDeviceLinux::OpenOnBlockingThreadWithFd, this,
-                            base::Passed(&fd), callback));
+                                           base::ScopedFD fd) {
+  if (fd.is_valid()) {
+    Opened(std::move(fd), callback);
+  } else {
+    USB_LOG(EVENT) << "Did not get valid device handle from permission broker.";
+    callback.Run(nullptr);
+  }

[stevenjb, 2016/08/30 15:45:59]

nit: invert if and early exit, no else.

[hashimoto, 2016/08/31 07:09:24]

Done.

 }
 
 void UsbDeviceLinux::OnOpenRequestError(const OpenCallback& callback,
@@ -102,20 +104,6 @@ void UsbDeviceLinux::OnOpenRequestError(const OpenCallback& callback,
   callback.Run(nullptr);
 }
 
-void UsbDeviceLinux::OpenOnBlockingThreadWithFd(dbus::FileDescriptor fd,
-                                                const OpenCallback& callback) {
-  fd.CheckValidity();
-  if (fd.is_valid()) {
-    base::ScopedFD scoped_fd(fd.TakeValue());
-    task_runner_->PostTask(FROM_HERE,
-                           base::Bind(&UsbDeviceLinux::Opened, this,
-                                      base::Passed(&scoped_fd), callback));
-  } else {
-    USB_LOG(EVENT) << "Did not get valid device handle from permission broker.";
-    task_runner_->PostTask(FROM_HERE, base::Bind(callback, nullptr));
-  }
-}
-
 #else
 
 void UsbDeviceLinux::OpenOnBlockingThread(const OpenCallback& callback) {