Index: chrome/browser/extensions/api/socket/tcp_socket.cc |
diff --git a/chrome/browser/extensions/api/socket/tcp_socket.cc b/chrome/browser/extensions/api/socket/tcp_socket.cc |
index 4f9273468ab31690db5401025e197e63b9aa6cb3..7dea350a41be06970c42ecf71ea14ca498f37e9a 100644 |
--- a/chrome/browser/extensions/api/socket/tcp_socket.cc |
+++ b/chrome/browser/extensions/api/socket/tcp_socket.cc |
@@ -306,6 +306,31 @@ void TCPSocket::OnAccept(int result) { |
accept_callback_.Reset(); |
} |
+ |
+void TCPSocket::Release() { |
+ // Really, the 'server' bool/checks are to get around warn_unused_result on |
+ // scoped_ptr.release(). |
+ bool server = false; |
+ is_connected_ = false; // Note: does _not_ disconnect any underlying sockets. |
+ server = server_socket_.release() != NULL; |
+ connect_callback_.Reset(); |
+ read_callback_.Reset(); |
+ accept_callback_.Reset(); |
+ server = accept_socket_.release() != NULL || server; |
Ryan Sleevi
2013/11/25 17:30:13
The whole |server| checks are *really* odd to me.
Lally Singh
2013/12/05 17:07:12
Fair enough. Cleaned up.
|
+ net::TCPClientSocket* sock = socket_.release(); |
+ if (server) { |
+ VLOG(1) << "TCPSocket::Release getting called in server mode. Odd."; |
+ } else if (sock == NULL && socket_mode_ == CLIENT) { |
+ VLOG(1) << "TCPSocket::Release on null client socket."; |
+ } |
+} |
+ |
+net::TCPClientSocket* TCPSocket::ClientStream() { |
+ if (socket_mode_ != CLIENT || GetSocketType() != TYPE_TCP) |
+ return NULL; |
+ return socket_.get(); |
+} |
+ |
ResumableTCPSocket::ResumableTCPSocket(const std::string& owner_extension_id) |
: TCPSocket(owner_extension_id), |
persistent_(false), |