summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/jingle_stream_connector.cc
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/protocol/jingle_stream_connector.cc')
-rw-r--r--remoting/protocol/jingle_stream_connector.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/protocol/jingle_stream_connector.cc b/remoting/protocol/jingle_stream_connector.cc
index 4eab85e..d7ce7fa 100644
--- a/remoting/protocol/jingle_stream_connector.cc
+++ b/remoting/protocol/jingle_stream_connector.cc
@@ -41,9 +41,7 @@ JingleStreamConnector::JingleStreamConnector(
: session_(session),
name_(name),
callback_(callback),
- raw_channel_(NULL),
- ALLOW_THIS_IN_INITIALIZER_LIST(tcp_connect_callback_(
- this, &JingleStreamConnector::OnTCPConnect)) {
+ raw_channel_(NULL) {
}
JingleStreamConnector::~JingleStreamConnector() {
@@ -83,11 +81,13 @@ bool JingleStreamConnector::EstablishTCPConnection(net::Socket* socket) {
adapter->SetSendBufferSize(kTcpSendBufferSize);
tcp_socket_.reset(adapter);
- int result = tcp_socket_->Connect(&tcp_connect_callback_);
+ int result = tcp_socket_->Connect(
+ base::Bind(&JingleStreamConnector::OnTCPConnect,
+ base::Unretained(this)));
if (result == net::ERR_IO_PENDING) {
return true;
} else if (result == net::OK) {
- tcp_connect_callback_.Run(result);
+ OnTCPConnect(result);
return true;
}