| Index: chromeos/network/firewall_hole.h
|
| diff --git a/chromeos/network/firewall_hole.h b/chromeos/network/firewall_hole.h
|
| index 63a7bc0e30a640009bf0166a91b571a908c132c4..61b0fc892bf9fbc45bf36319a879330679514418 100644
|
| --- a/chromeos/network/firewall_hole.h
|
| +++ b/chromeos/network/firewall_hole.h
|
| @@ -11,8 +11,8 @@
|
| #include <string>
|
|
|
| #include "base/callback_forward.h"
|
| +#include "base/files/scoped_file.h"
|
| #include "chromeos/chromeos_export.h"
|
| -#include "dbus/file_descriptor.h"
|
|
|
| namespace chromeos {
|
|
|
| @@ -38,31 +38,24 @@ class CHROMEOS_EXPORT FirewallHole {
|
| ~FirewallHole();
|
|
|
| private:
|
| - static void RequestPortAccess(PortType type,
|
| - uint16_t port,
|
| - const std::string& interface,
|
| - dbus::ScopedFileDescriptor lifeline_local,
|
| - dbus::ScopedFileDescriptor lifeline_remote,
|
| - const OpenCallback& callback);
|
| -
|
| static void PortAccessGranted(PortType type,
|
| uint16_t port,
|
| const std::string& interface,
|
| - dbus::ScopedFileDescriptor lifeline_fd,
|
| + base::ScopedFD lifeline_fd,
|
| const FirewallHole::OpenCallback& callback,
|
| bool success);
|
|
|
| FirewallHole(PortType type,
|
| uint16_t port,
|
| const std::string& interface,
|
| - dbus::ScopedFileDescriptor lifeline_fd);
|
| + base::ScopedFD lifeline_fd);
|
|
|
| const PortType type_;
|
| const uint16_t port_;
|
| const std::string interface_;
|
|
|
| // A file descriptor used by firewalld to track the lifetime of this process.
|
| - dbus::ScopedFileDescriptor lifeline_fd_;
|
| + base::ScopedFD lifeline_fd_;
|
| };
|
|
|
| } // namespace chromeos
|
|
|