Chromium Code Reviews| Index: net/websockets/websocket_basic_handshake_stream.cc |
| diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc |
| index 6255d8f2f97de3c469d6d05dbf8eb8c3114f1ea0..1bff9336b7644bf03b6c7726fd1238c7c316c7d4 100644 |
| --- a/net/websockets/websocket_basic_handshake_stream.cc |
| +++ b/net/websockets/websocket_basic_handshake_stream.cc |
| @@ -530,6 +530,15 @@ void WebSocketBasicHandshakeStream::SetPriority(RequestPriority priority) { |
| // gone, then copy whatever has happened there over here. |
| } |
| +UploadProgress WebSocketBasicHandshakeStream::GetUploadProgress() const { |
| + return UploadProgress(); |
| +} |
| + |
| +HttpStream* WebSocketBasicHandshakeStream::RenewStreamForAuth() { |
| + // Return null because we don't support renewing the stream. |
| + return nullptr; |
|
tyoshino (SeeGerritForStatus)
2014/11/04 17:03:58
use NULL for consistency with the other places whe
yhirano
2014/11/05 02:19:50
Then I would rather use nullptr than NULL.
Replace
|
| +} |
| + |
| scoped_ptr<WebSocketStream> WebSocketBasicHandshakeStream::Upgrade() { |
| // The HttpStreamParser object has a pointer to our ClientSocketHandle. Make |
| // sure it does not touch it again before it is destroyed. |