chromeos: Remove dbus::FileDescriptor from PermissionBrokerClient

device/usb/usb_device_linux.cc

 // Copyright 2016 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.
 
 #include "device/usb/usb_device_linux.h"
 
 #include <fcntl.h>
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/device_event_log/device_event_log.h"
 #include "device/usb/usb_descriptors.h"
 #include "device/usb/usb_device_handle_usbfs.h"
 #include "device/usb/usb_error.h"
 
 #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 {
 
 UsbDeviceLinux::UsbDeviceLinux(
     const std::string& device_path,
     const UsbDeviceDescriptor& descriptor,
     const std::string& manufacturer_string,
     const std::string& product_string,
     const std::string& serial_number,
@@ skipping 44 matching lines @@
 #else
   blocking_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&UsbDeviceLinux::OpenOnBlockingThread, this, callback));
 #endif  // defined(OS_CHROMEOS)
 }
 
 #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,
                                         const std::string& error_name,
                                         const std::string& error_message) {
   USB_LOG(EVENT) << "Permission broker failed to open the device: "
                  << error_name << ": " << error_message;
   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) {
   base::ScopedFD fd(HANDLE_EINTR(open(device_path_.c_str(), O_RDWR)));
   if (fd.is_valid()) {
     task_runner_->PostTask(FROM_HERE, base::Bind(&UsbDeviceLinux::Opened, this,
                                                  base::Passed(&fd), callback));
   } else {
     USB_PLOG(EVENT) << "Failed to open " << device_path_;
     task_runner_->PostTask(FROM_HERE, base::Bind(callback, nullptr));
   }
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 void UsbDeviceLinux::Opened(base::ScopedFD fd, const OpenCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   scoped_refptr<UsbDeviceHandle> device_handle =
       new UsbDeviceHandleUsbfs(this, std::move(fd), blocking_task_runner_);
   handles().push_back(device_handle.get());
   callback.Run(device_handle);
 }
 
 }  // namespace device