chromeos: Remove dbus::FileDescriptor from PermissionBrokerClient

chromeos/dbus/permission_broker_client.cc

 // Copyright (c) 2012 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 "chromeos/dbus/permission_broker_client.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 43 matching lines @@
     proxy_->CallMethodWithErrorCallback(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&PermissionBrokerClientImpl::OnOpenPathResponse,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&PermissionBrokerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   void RequestTcpPortAccess(uint16_t port,
                             const std::string& interface,
-                            const dbus::FileDescriptor& lifeline_fd,
+                            int lifeline_fd,
                             const ResultCallback& callback) override {
     dbus::MethodCall method_call(kPermissionBrokerInterface,
                                  kRequestTcpPortAccess);
     dbus::MessageWriter writer(&method_call);
     writer.AppendUint16(port);
     writer.AppendString(interface);
     writer.AppendFileDescriptor(lifeline_fd);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&PermissionBrokerClientImpl::OnResponse,
                                   weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
   void RequestUdpPortAccess(uint16_t port,
                             const std::string& interface,
-                            const dbus::FileDescriptor& lifeline_fd,
+                            int lifeline_fd,
                             const ResultCallback& callback) override {
     dbus::MethodCall method_call(kPermissionBrokerInterface,
                                  kRequestUdpPortAccess);
     dbus::MessageWriter writer(&method_call);
     writer.AppendUint16(port);
     writer.AppendString(interface);
     writer.AppendFileDescriptor(lifeline_fd);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&PermissionBrokerClientImpl::OnResponse,
                                   weak_ptr_factory_.GetWeakPtr(), callback));
@@ skipping 42 matching lines @@
 
     bool result = false;
     dbus::MessageReader reader(response);
     if (!reader.PopBool(&result))
       LOG(WARNING) << "Could not parse response: " << response->ToString();
     callback.Run(result);
   }
 
   void OnOpenPathResponse(const OpenPathCallback& callback,
                           dbus::Response* response) {
-    dbus::FileDescriptor fd;
+    base::ScopedFD fd;
     dbus::MessageReader reader(response);
     if (!reader.PopFileDescriptor(&fd))
       LOG(WARNING) << "Could not parse response: " << response->ToString();
     callback.Run(std::move(fd));
   }
 
   void OnError(const ErrorCallback& callback, dbus::ErrorResponse* response) {
     std::string error_name;
     std::string error_message;
     if (response) {
@@ skipping 18 matching lines @@
 
 PermissionBrokerClient::PermissionBrokerClient() {}
 
 PermissionBrokerClient::~PermissionBrokerClient() {}
 
 PermissionBrokerClient* PermissionBrokerClient::Create() {
   return new PermissionBrokerClientImpl();
 }
 
 }  // namespace chromeos