Fixing SecurityKeySocket unit test issues and cleanup

remoting/host/security_key/security_key_socket.h

 // 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.
 
 #ifndef REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_SOCKET_H_
 #define REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_SOCKET_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 26 matching lines @@
                     base::TimeDelta timeout,
                     const base::Closure& timeout_callback);
   ~SecurityKeySocket();
 
   // Returns false if the request has not yet completed, or is too large to be
   // processed. Otherwise, the cached request data is copied into |data_out| and
   // the internal buffer resets and is ready for the next request.
   bool GetAndClearRequestData(std::string* data_out);
 
   // Sends response data to the socket.
-  void SendResponse(const std::string& data);
+  void SendResponse(const std::string& data,
+                    const base::Closure& response_written_callback);
 
   // Sends an SSH error code to the socket.
-  void SendSshError();
+  void SendSshError(const base::Closure& error_sent_callback);
 
   // |request_received_callback| is used to notify the caller that request data
   // has been fully read, and caller is to use GetAndClearRequestData method to
   // get the request data.
   void StartReadingRequest(const base::Closure& request_received_callback);
 
  private:
   // Called when bytes are written to |socket_|.
   void OnDataWritten(int result);
 
@@ skipping 23 matching lines @@
 
   // Ensures SecurityKeySocketSocket methods are called on the same thread.
   base::ThreadChecker thread_checker_;
 
   // The socket.
   std::unique_ptr<net::StreamSocket> socket_;
 
   // Invoked when request data has been read.
   base::Closure request_received_callback_;
 
+  // Invoked when the response has been written.
+  base::Closure response_written_callback_;
+
   // Indicates whether read has completed and |request_received_callback_| is
   // about to be run.
   bool read_completed_;
 
   // Request data.
   std::vector<char> request_data_;
 
   scoped_refptr<net::DrainableIOBuffer> write_buffer_;
 
   scoped_refptr<net::IOBufferWithSize> read_buffer_;
 
   // The activity timer.
   std::unique_ptr<base::Timer> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SecurityKeySocket);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_SOCKET_H_