| Index: remoting/protocol/socket_reader_base.cc
|
| diff --git a/remoting/protocol/socket_reader_base.cc b/remoting/protocol/socket_reader_base.cc
|
| index 743120df0bd35772b810b361e7dbb2a14fc05e75..f399927d423b95005b733af82436b6d0a790e4ee 100644
|
| --- a/remoting/protocol/socket_reader_base.cc
|
| +++ b/remoting/protocol/socket_reader_base.cc
|
| @@ -17,9 +17,7 @@ int kReadBufferSize = 4096;
|
|
|
| SocketReaderBase::SocketReaderBase()
|
| : socket_(NULL),
|
| - closed_(false),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(
|
| - read_callback_(this, &SocketReaderBase::OnRead)) {
|
| + closed_(false) {
|
| }
|
|
|
| SocketReaderBase::~SocketReaderBase() { }
|
| @@ -34,7 +32,8 @@ void SocketReaderBase::DoRead() {
|
| while (true) {
|
| read_buffer_ = new net::IOBuffer(kReadBufferSize);
|
| int result = socket_->Read(
|
| - read_buffer_, kReadBufferSize, &read_callback_);
|
| + read_buffer_, kReadBufferSize, base::Bind(&SocketReaderBase::OnRead,
|
| + base::Unretained(this)));
|
| HandleReadResult(result);
|
| if (result < 0)
|
| break;
|
|
|