Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5810)

Unified Diff: chrome/test/chromedriver/net/websocket.cc

Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/chromedriver/net/test_http_server.cc ('k') | chrome/test/perf/frame_rate/frame_rate_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
« no previous file with comments | « chrome/test/chromedriver/net/test_http_server.cc ('k') | chrome/test/perf/frame_rate/frame_rate_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698