diff options
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_http_stream.cc | 7 | ||||
| -rw-r--r-- | net/spdy/spdy_http_stream.h | 48 |
2 files changed, 24 insertions, 31 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc index ac0c4ce..130a818 100644 --- a/net/spdy/spdy_http_stream.cc +++ b/net/spdy/spdy_http_stream.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -177,11 +177,6 @@ void SpdyHttpStream::SetConnectionReused() { // SPDY doesn't need an indicator here. } -bool SpdyHttpStream::IsConnectionReusable() const { - // SPDY streams aren't considered reusable. - return false; -} - void SpdyHttpStream::set_chunk_callback(ChunkCallback* callback) { if (request_body_stream_ != NULL) request_body_stream_->set_chunk_callback(callback); diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h index 31f62f6..6bc5053 100644 --- a/net/spdy/spdy_http_stream.h +++ b/net/spdy/spdy_http_stream.h @@ -45,41 +45,39 @@ class SpdyHttpStream : public SpdyStream::Delegate, public HttpStream { // HttpStream methods: virtual int InitializeStream(const HttpRequestInfo* request_info, const BoundNetLog& net_log, - CompletionCallback* callback) OVERRIDE; + CompletionCallback* callback); virtual int SendRequest(const HttpRequestHeaders& headers, UploadDataStream* request_body, HttpResponseInfo* response, - CompletionCallback* callback) OVERRIDE; - virtual uint64 GetUploadProgress() const OVERRIDE; - virtual int ReadResponseHeaders(CompletionCallback* callback) OVERRIDE; + CompletionCallback* callback); + virtual uint64 GetUploadProgress() const; + virtual int ReadResponseHeaders(CompletionCallback* callback); virtual const HttpResponseInfo* GetResponseInfo() const; virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - CompletionCallback* callback) OVERRIDE; - virtual void Close(bool not_reusable) OVERRIDE; - virtual HttpStream* RenewStreamForAuth() OVERRIDE; - virtual bool IsResponseBodyComplete() const OVERRIDE; - virtual bool CanFindEndOfResponse() const OVERRIDE; - virtual bool IsMoreDataBuffered() const OVERRIDE; - virtual bool IsConnectionReused() const OVERRIDE; - virtual void SetConnectionReused() OVERRIDE; - virtual bool IsConnectionReusable() const OVERRIDE; - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; - virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual bool IsSpdyHttpStream() const OVERRIDE; + CompletionCallback* callback); + virtual void Close(bool not_reusable); + virtual HttpStream* RenewStreamForAuth(); + virtual bool IsResponseBodyComplete() const; + virtual bool CanFindEndOfResponse() const; + virtual bool IsMoreDataBuffered() const; + virtual bool IsConnectionReused() const; + virtual void SetConnectionReused(); + virtual void GetSSLInfo(SSLInfo* ssl_info); + virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info); + virtual bool IsSpdyHttpStream() const; // SpdyStream::Delegate methods: - virtual bool OnSendHeadersComplete(int status) OVERRIDE; - virtual int OnSendBody() OVERRIDE; - virtual int OnSendBodyComplete(int status, bool* eof) OVERRIDE; + virtual bool OnSendHeadersComplete(int status); + virtual int OnSendBody(); + virtual int OnSendBodyComplete(int status, bool* eof); virtual int OnResponseReceived(const spdy::SpdyHeaderBlock& response, base::Time response_time, - int status) OVERRIDE; - virtual void OnDataReceived(const char* buffer, int bytes) OVERRIDE; - virtual void OnDataSent(int length) OVERRIDE; - virtual void OnClose(int status) OVERRIDE; - virtual void set_chunk_callback(ChunkCallback* callback) OVERRIDE; + int status); + virtual void OnDataReceived(const char* buffer, int bytes); + virtual void OnDataSent(int length); + virtual void OnClose(int status); + virtual void set_chunk_callback(ChunkCallback* callback); private: FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, FlowControlStallResume); |