2 files changed, 31 insertions, 13 deletions

diff --git a/chromeos/network/firewall_hole.cc b/chromeos/network/firewall_hole.cc
index 3ad3463..425e423 100644
--- a/chromeos/network/firewall_hole.cc
+++ b/chromeos/network/firewall_hole.cc
@@ -50,7 +50,7 @@ const char* PortTypeToString(FirewallHole::PortType type) {
 void PortReleased(FirewallHole::PortType type,
                   uint16_t port,
                   const std::string& interface,
-                  dbus::ScopedFileDescriptor lifeline_fd,
+                  FirewallHole::ScopedFileDescriptor lifeline_fd,
                   bool success) {
   if (!success) {
     LOG(WARNING) << "Failed to release firewall hole for "
@@ -61,13 +61,20 @@ void PortReleased(FirewallHole::PortType type,
 
 }  // namespace
 
+void CHROMEOS_EXPORT FirewallHole::FileDescriptorDeleter::operator()(
+    dbus::FileDescriptor* fd) {
+  base::WorkerPool::PostTask(
+      FROM_HERE, base::Bind(&base::DeletePointer<dbus::FileDescriptor>, fd),
+      false);
+}
+
 // static
 void FirewallHole::Open(PortType type,
                         uint16_t port,
                         const std::string& interface,
                         const OpenCallback& callback) {
-  dbus::ScopedFileDescriptor lifeline_local(new dbus::FileDescriptor());
-  dbus::ScopedFileDescriptor lifeline_remote(new dbus::FileDescriptor());
+  ScopedFileDescriptor lifeline_local(new dbus::FileDescriptor());
+  ScopedFileDescriptor lifeline_remote(new dbus::FileDescriptor());
 
   // This closure shares pointers with the one below. PostTaskAndReply
   // guarantees that it will always be deleted first.
@@ -102,8 +109,8 @@ FirewallHole::~FirewallHole() {
 void FirewallHole::RequestPortAccess(PortType type,
                                      uint16_t port,
                                      const std::string& interface,
-                                     dbus::ScopedFileDescriptor lifeline_local,
-                                     dbus::ScopedFileDescriptor lifeline_remote,
+                                     ScopedFileDescriptor lifeline_local,
+                                     ScopedFileDescriptor lifeline_remote,
                                      const OpenCallback& callback) {
   if (!lifeline_local->is_valid() || !lifeline_remote->is_valid()) {
     callback.Run(nullptr);
@@ -133,7 +140,7 @@ void FirewallHole::RequestPortAccess(PortType type,
 void FirewallHole::PortAccessGranted(PortType type,
                                      uint16_t port,
                                      const std::string& interface,
-                                     dbus::ScopedFileDescriptor lifeline_fd,
+                                     ScopedFileDescriptor lifeline_fd,
                                      const FirewallHole::OpenCallback& callback,
                                      bool success) {
   if (success) {
@@ -147,7 +154,7 @@ void FirewallHole::PortAccessGranted(PortType type,
 FirewallHole::FirewallHole(PortType type,
                            uint16_t port,
                            const std::string& interface,
-                           dbus::ScopedFileDescriptor lifeline_fd)
+                           ScopedFileDescriptor lifeline_fd)
     : type_(type),
       port_(port),
       interface_(interface),
diff --git a/chromeos/network/firewall_hole.h b/chromeos/network/firewall_hole.h
index e6d119d..2bd6788 100644
--- a/chromeos/network/firewall_hole.h
+++ b/chromeos/network/firewall_hole.h
@@ -11,7 +11,10 @@
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
-#include "dbus/file_descriptor.h"
+
+namespace dbus {
+class FileDescriptor;
+}
 
 namespace chromeos {
 
@@ -26,6 +29,14 @@ class CHROMEOS_EXPORT FirewallHole {
 
   typedef base::Callback<void(scoped_ptr<FirewallHole>)> OpenCallback;
 
+  // This provides a simple way to pass around file descriptors since they must
+  // be closed on a thread that is allowed to perform I/O.
+  struct FileDescriptorDeleter {
+    void CHROMEOS_EXPORT operator()(dbus::FileDescriptor* fd);
+  };
+  typedef scoped_ptr<dbus::FileDescriptor, FileDescriptorDeleter>
+      ScopedFileDescriptor;
+
   // Opens a port on the system firewall for the given network interface (or all
   // interfaces if |interface| is ""). The hole will be closed when the object
   // provided to the callback is destroyed.
@@ -40,28 +51,28 @@ class CHROMEOS_EXPORT FirewallHole {
   static void RequestPortAccess(PortType type,
                                 uint16_t port,
                                 const std::string& interface,
-                                dbus::ScopedFileDescriptor lifeline_local,
-                                dbus::ScopedFileDescriptor lifeline_remote,
+                                ScopedFileDescriptor lifeline_local,
+                                ScopedFileDescriptor lifeline_remote,
                                 const OpenCallback& callback);
 
   static void PortAccessGranted(PortType type,
                                 uint16_t port,
                                 const std::string& interface,
-                                dbus::ScopedFileDescriptor lifeline_fd,
+                                ScopedFileDescriptor lifeline_fd,
                                 const FirewallHole::OpenCallback& callback,
                                 bool success);
 
   FirewallHole(PortType type,
                uint16_t port,
                const std::string& interface,
-               dbus::ScopedFileDescriptor lifeline_fd);
+               ScopedFileDescriptor 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_;
+  ScopedFileDescriptor lifeline_fd_;
 };
 
 }  // namespace chromeos