| Index: chrome/test/chromedriver/net/websocket.cc
|
| diff --git a/chrome/test/chromedriver/net/websocket.cc b/chrome/test/chromedriver/net/websocket.cc
|
| index b48c6a3f7008e3580047512118cbacf5651449d1..82bab3c88cc72aaed48a0a9c4c2570d1d4d38209 100644
|
| --- a/chrome/test/chromedriver/net/websocket.cc
|
| +++ b/chrome/test/chromedriver/net/websocket.cc
|
| @@ -128,19 +128,19 @@ void WebSocket::ContinueWritingIfNecessary() {
|
| pending_write_.length());
|
| pending_write_.clear();
|
| }
|
| - int code = socket_->Write(
|
| - write_buffer_,
|
| - write_buffer_->BytesRemaining(),
|
| - base::Bind(&WebSocket::OnWrite, base::Unretained(this)));
|
| + int code =
|
| + socket_->Write(write_buffer_.get(),
|
| + write_buffer_->BytesRemaining(),
|
| + base::Bind(&WebSocket::OnWrite, base::Unretained(this)));
|
| if (code != net::ERR_IO_PENDING)
|
| OnWrite(code);
|
| }
|
|
|
| void WebSocket::Read() {
|
| - int code = socket_->Read(
|
| - read_buffer_,
|
| - read_buffer_->size(),
|
| - base::Bind(&WebSocket::OnRead, base::Unretained(this)));
|
| + int code =
|
| + socket_->Read(read_buffer_.get(),
|
| + read_buffer_->size(),
|
| + base::Bind(&WebSocket::OnRead, base::Unretained(this)));
|
| if (code != net::ERR_IO_PENDING)
|
| OnRead(code);
|
| }
|
| @@ -196,7 +196,7 @@ void WebSocket::OnReadDuringOpen(const char* data, int len) {
|
| CHECK(parser_.Decode(data, len, &frame_chunks));
|
| for (size_t i = 0; i < frame_chunks.size(); ++i) {
|
| scoped_refptr<net::IOBufferWithSize> buffer = frame_chunks[i]->data;
|
| - if (buffer)
|
| + if (buffer.get())
|
| next_message_ += std::string(buffer->data(), buffer->size());
|
| if (frame_chunks[i]->final_chunk) {
|
| listener_->OnMessageReceived(next_message_);
|
|
|