diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /net/socket_stream/socket_stream.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'net/socket_stream/socket_stream.cc')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index 7c3c5e9..6d6efbe 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -138,7 +138,8 @@ void SocketStream::Connect() { next_state_ = STATE_RESOLVE_PROXY; net_log_.BeginEvent( NetLog::TYPE_SOCKET_STREAM_CONNECT, - new NetLogStringParameter("url", url_.possibly_invalid_spec())); + make_scoped_refptr( + new NetLogStringParameter("url", url_.possibly_invalid_spec()))); MessageLoop::current()->PostTask( FROM_HERE, NewRunnableMethod(this, &SocketStream::DoLoop, OK)); @@ -162,7 +163,8 @@ bool SocketStream::SendData(const char* data, int len) { if (current_amount_send > max_pending_send_allowed_) return false; - pending_write_bufs_.push_back(new IOBufferWithSize(len)); + pending_write_bufs_.push_back(make_scoped_refptr( + new IOBufferWithSize(len))); memcpy(pending_write_bufs_.back()->data(), data, len); return true; } @@ -445,8 +447,9 @@ void SocketStream::DoLoop(int result) { // close the connection. if (state != STATE_READ_WRITE && result < ERR_IO_PENDING) { DCHECK_EQ(next_state_, STATE_CLOSE); - net_log_.EndEvent(NetLog::TYPE_SOCKET_STREAM_CONNECT, - new NetLogIntegerParameter("net_error", result)); + net_log_.EndEvent( + NetLog::TYPE_SOCKET_STREAM_CONNECT, + make_scoped_refptr(new NetLogIntegerParameter("net_error", result))); } } while (result != ERR_IO_PENDING); } |