chromeos: Remove dbus::FileDescriptor from PermissionBrokerClient

device/serial/serial_io_handler.cc

 // Copyright 2014 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/serial/serial_io_handler.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.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 {
 
 SerialIoHandler::SerialIoHandler(
     scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_thread_task_runner)
     : file_thread_task_runner_(file_thread_task_runner),
       ui_thread_task_runner_(ui_thread_task_runner) {
   options_.bitrate = 9600;
@@ skipping 24 matching lines @@
   chromeos::PermissionBrokerClient* client =
       chromeos::DBusThreadManager::Get()->GetPermissionBrokerClient();
   DCHECK(client) << "Could not get permission_broker client.";
   // PermissionBrokerClient should be called on the UI thread.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       base::ThreadTaskRunnerHandle::Get();
   ui_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &chromeos::PermissionBrokerClient::OpenPath, base::Unretained(client),
-          port, base::Bind(&SerialIoHandler::OnPathOpened, this,
-                           file_thread_task_runner_, task_runner),
+          port, base::Bind(&SerialIoHandler::OnPathOpened, this, task_runner),
           base::Bind(&SerialIoHandler::OnPathOpenError, this, task_runner)));
 #else
   file_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&SerialIoHandler::StartOpen, this, port,
                             base::ThreadTaskRunnerHandle::Get()));
 #endif  // defined(OS_CHROMEOS)
 }
 
 #if defined(OS_CHROMEOS)
 
 void SerialIoHandler::OnPathOpened(
-    scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
-    dbus::FileDescriptor fd) {
-  file_thread_task_runner->PostTask(
-      FROM_HERE, base::Bind(&SerialIoHandler::ValidateOpenPort, this,
-                            io_thread_task_runner, base::Passed(&fd)));
+    base::ScopedFD fd) {
+  base::File file(fd.release());
+  io_thread_task_runner->PostTask(
+      FROM_HERE,
+      base::Bind(&SerialIoHandler::FinishOpen, this, base::Passed(&file)));
 }
 
 void SerialIoHandler::OnPathOpenError(
     scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
     const std::string& error_name,
     const std::string& error_message) {
   io_thread_task_runner->PostTask(
       FROM_HERE, base::Bind(&SerialIoHandler::ReportPathOpenError, this,
                             error_name, error_message));
 }
 
-void SerialIoHandler::ValidateOpenPort(
-    scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
-    dbus::FileDescriptor fd) {
-  base::File file;
-  fd.CheckValidity();
-  if (fd.is_valid()) {
-    file = base::File(fd.TakeValue());
-  }
-
-  io_thread_task_runner->PostTask(
-      FROM_HERE,
-      base::Bind(&SerialIoHandler::FinishOpen, this, base::Passed(&file)));
-}
-
 void SerialIoHandler::ReportPathOpenError(const std::string& error_name,
                                           const std::string& error_message) {
   DCHECK(CalledOnValidThread());
   DCHECK(!open_complete_.is_null());
   LOG(ERROR) << "Permission broker failed to open '" << port_
              << "': " << error_name << ": " << error_message;
   OpenCompleteCallback callback = open_complete_;
   open_complete_.Reset();
   callback.Run(false);
 }
@@ skipping 169 matching lines @@
 }
 
 void SerialIoHandler::QueueWriteCompleted(int bytes_written,
                                           serial::SendError error) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&SerialIoHandler::WriteCompleted, this, bytes_written, error));
 }
 
 }  // namespace device