Updating Security Key logic to work on OSX

remoting/host/security_key/security_key_auth_handler_posix.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 "remoting/host/security_key/security_key_auth_handler.h"
 
 #include <unistd.h>
 
 #include <cstdint>
 #include <map>
@@ skipping 132 matching lines @@
   g_security_key_socket_name.Get() = security_key_socket_name;
 }
 
 SecurityKeyAuthHandlerPosix::SecurityKeyAuthHandlerPosix(
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
     : file_task_runner_(file_task_runner),
       request_timeout_(
           base::TimeDelta::FromSeconds(kDefaultRequestTimeoutSeconds)),
       weak_factory_(this) {}
 
-SecurityKeyAuthHandlerPosix::~SecurityKeyAuthHandlerPosix() {}
+SecurityKeyAuthHandlerPosix::~SecurityKeyAuthHandlerPosix() {
+  if (file_task_runner_) {
+    // Attempt to clean up the socket before being destroyed.
+    file_task_runner_->PostTask(
+        FROM_HERE, base::Bind(base::IgnoreResult(&base::DeleteFile),
+                              g_security_key_socket_name.Get(),
+                              /*recursive=*/false));
+  }
+}
 
 void SecurityKeyAuthHandlerPosix::CreateSecurityKeyConnection() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!g_security_key_socket_name.Get().empty());
 
   // We need to run the DeleteFile method on |file_task_runner_| as it is a
   // blocking function call which cannot be run on the main thread.  Once
   // that task has completed, the main thread will be called back and we will
   // resume setting up our security key auth socket there.
   file_task_runner_->PostTaskAndReply(
       FROM_HERE, base::Bind(base::IgnoreResult(&base::DeleteFile),
-                            g_security_key_socket_name.Get(), false),
+                            g_security_key_socket_name.Get(),
+                            /*recursive=*/false),
       base::Bind(&SecurityKeyAuthHandlerPosix::CreateSocket,
                  weak_factory_.GetWeakPtr()));
 }
 
 void SecurityKeyAuthHandlerPosix::CreateSocket() {
   DCHECK(thread_checker_.CalledOnValidThread());
   HOST_LOG << "Listening for security key requests on "
            << g_security_key_socket_name.Get().value();
 
   auth_socket_.reset(
@@ skipping 121 matching lines @@
 void SecurityKeyAuthHandlerPosix::RequestTimedOut(
     int security_key_connection_id) {
   HOST_LOG << "SecurityKey request timed out";
   ActiveSockets::const_iterator iter =
       active_sockets_.find(security_key_connection_id);
   if (iter != active_sockets_.end())
     SendErrorAndCloseActiveSocket(iter);
 }
 
 }  // namespace remoting