Index: remoting/protocol/message_reader.cc |
diff --git a/remoting/protocol/message_reader.cc b/remoting/protocol/message_reader.cc |
index 44389d71473d6dc54a7bf7ac9333cfa1ef76d3af..3516595e85330a03ccbe436ef6f652c3e6a6b0e8 100644 |
--- a/remoting/protocol/message_reader.cc |
+++ b/remoting/protocol/message_reader.cc |
@@ -26,20 +26,18 @@ static const int kReadBufferSize = 4096; |
MessageReader::MessageReader() : weak_factory_(this) {} |
MessageReader::~MessageReader() {} |
-void MessageReader::SetMessageReceivedCallback( |
- const MessageReceivedCallback& callback) { |
- DCHECK(CalledOnValidThread()); |
- message_received_callback_ = callback; |
-} |
- |
void MessageReader::StartReading( |
P2PStreamSocket* socket, |
+ const MessageReceivedCallback& message_received_callback, |
const ReadFailedCallback& read_failed_callback) { |
DCHECK(CalledOnValidThread()); |
+ DCHECK(!socket_); |
DCHECK(socket); |
+ DCHECK(!message_received_callback.is_null()); |
DCHECK(!read_failed_callback.is_null()); |
socket_ = socket; |
+ message_received_callback_ = message_received_callback; |
read_failed_callback_ = read_failed_callback; |
DoRead(); |
} |