diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 20:15:57 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 20:15:57 +0000 |
| commit | 00cd9c4e71d1e6dd6cc3a2fff60505479304c9d1 (patch) | |
| tree | eb61d6402a5e967e5eb1d41dfde730af48dfa55f /net/websockets | |
| parent | d9b888cdf9ad654a3f2e5c22b935e68db77a71ef (diff) | |
| download | chromium_src-00cd9c4e71d1e6dd6cc3a2fff60505479304c9d1.zip chromium_src-00cd9c4e71d1e6dd6cc3a2fff60505479304c9d1.tar.gz chromium_src-00cd9c4e71d1e6dd6cc3a2fff60505479304c9d1.tar.bz2 | |
Convert implicit scoped_refptr constructor calls to explicit ones, part 2
This CL was created automatically by this clang rewriter: http://codereview.appspot.com/2826041
I then did quite a bit of manual editing to fix style issues.
BUG=28083
TEST=None
Review URL: http://codereview.chromium.org/4291001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
| -rw-r--r-- | net/websockets/websocket.cc | 6 | ||||
| -rw-r--r-- | net/websockets/websocket_job.cc | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net/websockets/websocket.cc b/net/websockets/websocket.cc index 3bf1da8..f8d9eb9 100644 --- a/net/websockets/websocket.cc +++ b/net/websockets/websocket.cc @@ -80,7 +80,7 @@ void WebSocket::Send(const std::string& msg) { *p = '\0'; memcpy(p + 1, msg.data(), msg.size()); *(p + 1 + msg.size()) = '\xff'; - pending_write_bufs_.push_back(buf); + pending_write_bufs_.push_back(make_scoped_refptr(buf)); SendPending(); } @@ -172,7 +172,7 @@ void WebSocket::OnConnected(SocketStream* socket_stream, const std::string msg = handshake_->CreateClientHandshakeMessage(); IOBufferWithSize* buf = new IOBufferWithSize(msg.size()); memcpy(buf->data(), msg.data(), msg.size()); - pending_write_bufs_.push_back(buf); + pending_write_bufs_.push_back(make_scoped_refptr(buf)); origin_loop_->PostTask(FROM_HERE, NewRunnableMethod(this, &WebSocket::SendPending)); } @@ -430,7 +430,7 @@ void WebSocket::StartClosingHandshake() { client_closing_handshake_ = true; IOBufferWithSize* buf = new IOBufferWithSize(2); memcpy(buf->data(), kClosingFrame, 2); - pending_write_bufs_.push_back(buf); + pending_write_bufs_.push_back(make_scoped_refptr(buf)); SendPending(); } diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc index 64af45b..a1e2dde 100644 --- a/net/websockets/websocket_job.cc +++ b/net/websockets/websocket_job.cc @@ -313,7 +313,8 @@ void WebSocketJob::OnCanGetCookiesCompleted(int policy) { handshake_request_sent_ = 0; socket_->net_log()->AddEvent( NetLog::TYPE_WEB_SOCKET_SEND_REQUEST_HEADERS, - new NetLogWebSocketHandshakeParameter(handshake_request)); + make_scoped_refptr( + new NetLogWebSocketHandshakeParameter(handshake_request))); socket_->SendData(handshake_request.data(), handshake_request.size()); } @@ -354,8 +355,8 @@ void WebSocketJob::OnReceivedHandshakeResponse( // handshake message is completed. socket_->net_log()->AddEvent( NetLog::TYPE_WEB_SOCKET_READ_RESPONSE_HEADERS, - new NetLogWebSocketHandshakeParameter( - handshake_response_->GetRawResponse())); + make_scoped_refptr(new NetLogWebSocketHandshakeParameter( + handshake_response_->GetRawResponse()))); if (len - response_length > 0) { // If we received extra data, it should be frame data. receive_frame_handler_->AppendData(data + response_length, |