diff options
author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 00:30:21 +0000 |
---|---|---|
committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 00:30:21 +0000 |
commit | 07e10dca43b3d55742a6afb506b01c1879fbf216 (patch) | |
tree | 04823d6535f6463b06ab0604d38276e2ac30a907 /net | |
parent | d65e39748cc8cbd5e6a0a6a3faf650ff3ad2eb18 (diff) | |
download | chromium_src-07e10dca43b3d55742a6afb506b01c1879fbf216.zip chromium_src-07e10dca43b3d55742a6afb506b01c1879fbf216.tar.gz chromium_src-07e10dca43b3d55742a6afb506b01c1879fbf216.tar.bz2 |
Remove the unused HttpStreamBase::IsMoreDataBuffered().
HttpNetworkTransaction used to use it in conjunction with Http
proxy error checking, but now there's HttpProxyClientSocket
which uses HttpStreamParser directly.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/12538010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/http/http_basic_stream.cc | 6 | ||||
-rw-r--r-- | net/http/http_basic_stream.h | 2 | ||||
-rw-r--r-- | net/http/http_pipelined_connection_impl.cc | 5 | ||||
-rw-r--r-- | net/http/http_pipelined_connection_impl.h | 2 | ||||
-rw-r--r-- | net/http/http_pipelined_stream.cc | 4 | ||||
-rw-r--r-- | net/http/http_pipelined_stream.h | 2 | ||||
-rw-r--r-- | net/http/http_response_body_drainer_unittest.cc | 1 | ||||
-rw-r--r-- | net/http/http_stream.h | 5 | ||||
-rw-r--r-- | net/quic/quic_http_stream.cc | 4 | ||||
-rw-r--r-- | net/quic/quic_http_stream.h | 1 | ||||
-rw-r--r-- | net/quic/quic_http_stream_test.cc | 6 | ||||
-rw-r--r-- | net/spdy/spdy_http_stream.cc | 4 | ||||
-rw-r--r-- | net/spdy/spdy_http_stream.h | 1 |
13 files changed, 1 insertions, 42 deletions
diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc index b8300df..9166d3a 100644 --- a/net/http/http_basic_stream.cc +++ b/net/http/http_basic_stream.cc @@ -83,7 +83,7 @@ void HttpBasicStream::Close(bool not_reusable) { HttpStream* HttpBasicStream::RenewStreamForAuth() { DCHECK(IsResponseBodyComplete()); - DCHECK(!IsMoreDataBuffered()); + DCHECK(!parser_->IsMoreDataBuffered()); parser_.reset(); return new HttpBasicStream(connection_.release(), NULL, using_proxy_); } @@ -96,10 +96,6 @@ bool HttpBasicStream::CanFindEndOfResponse() const { return parser_->CanFindEndOfResponse(); } -bool HttpBasicStream::IsMoreDataBuffered() const { - return parser_->IsMoreDataBuffered(); -} - bool HttpBasicStream::IsConnectionReused() const { return parser_->IsConnectionReused(); } diff --git a/net/http/http_basic_stream.h b/net/http/http_basic_stream.h index f0545e2..1454b2d 100644 --- a/net/http/http_basic_stream.h +++ b/net/http/http_basic_stream.h @@ -62,8 +62,6 @@ class HttpBasicStream : public HttpStream { virtual bool CanFindEndOfResponse() const OVERRIDE; - virtual bool IsMoreDataBuffered() const OVERRIDE; - virtual bool IsConnectionReused() const OVERRIDE; virtual void SetConnectionReused() OVERRIDE; diff --git a/net/http/http_pipelined_connection_impl.cc b/net/http/http_pipelined_connection_impl.cc index d45f69c..e7cb751 100644 --- a/net/http/http_pipelined_connection_impl.cc +++ b/net/http/http_pipelined_connection_impl.cc @@ -641,11 +641,6 @@ bool HttpPipelinedConnectionImpl::CanFindEndOfResponse(int pipeline_id) const { CanFindEndOfResponse(); } -bool HttpPipelinedConnectionImpl::IsMoreDataBuffered(int pipeline_id) const { - CHECK(ContainsKey(stream_info_map_, pipeline_id)); - return read_buf_->offset() != 0; -} - bool HttpPipelinedConnectionImpl::IsConnectionReused(int pipeline_id) const { CHECK(ContainsKey(stream_info_map_, pipeline_id)); if (pipeline_id > 1) { diff --git a/net/http/http_pipelined_connection_impl.h b/net/http/http_pipelined_connection_impl.h index f49fb12..f8246a0 100644 --- a/net/http/http_pipelined_connection_impl.h +++ b/net/http/http_pipelined_connection_impl.h @@ -121,8 +121,6 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl bool CanFindEndOfResponse(int pipeline_id) const; - bool IsMoreDataBuffered(int pipeline_id) const; - bool IsConnectionReused(int pipeline_id) const; void SetConnectionReused(int pipeline_id); diff --git a/net/http/http_pipelined_stream.cc b/net/http/http_pipelined_stream.cc index 6b588a8..123419e 100644 --- a/net/http/http_pipelined_stream.cc +++ b/net/http/http_pipelined_stream.cc @@ -86,10 +86,6 @@ bool HttpPipelinedStream::CanFindEndOfResponse() const { return pipeline_->CanFindEndOfResponse(pipeline_id_); } -bool HttpPipelinedStream::IsMoreDataBuffered() const { - return pipeline_->IsMoreDataBuffered(pipeline_id_); -} - bool HttpPipelinedStream::IsConnectionReused() const { return pipeline_->IsConnectionReused(pipeline_id_); } diff --git a/net/http/http_pipelined_stream.h b/net/http/http_pipelined_stream.h index a1319e9..d37a057 100644 --- a/net/http/http_pipelined_stream.h +++ b/net/http/http_pipelined_stream.h @@ -62,8 +62,6 @@ class HttpPipelinedStream : public HttpStream { virtual bool CanFindEndOfResponse() const OVERRIDE; - virtual bool IsMoreDataBuffered() const OVERRIDE; - virtual bool IsConnectionReused() const OVERRIDE; virtual void SetConnectionReused() OVERRIDE; diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc index 57cb8e0..02feafe 100644 --- a/net/http/http_response_body_drainer_unittest.cc +++ b/net/http/http_response_body_drainer_unittest.cc @@ -97,7 +97,6 @@ class MockHttpStream : public HttpStream { } virtual bool CanFindEndOfResponse() const OVERRIDE { return true; } - virtual bool IsMoreDataBuffered() const OVERRIDE { return false; } virtual bool IsConnectionReused() const OVERRIDE { return false; } virtual void SetConnectionReused() OVERRIDE {} virtual bool IsConnectionReusable() const OVERRIDE { return false; } diff --git a/net/http/http_stream.h b/net/http/http_stream.h index 2143057..0296e23 100644 --- a/net/http/http_stream.h +++ b/net/http/http_stream.h @@ -36,11 +36,6 @@ class NET_EXPORT_PRIVATE HttpStream : public HttpStreamBase { // subclass does not support renewing the stream, NULL is returned. virtual HttpStream* RenewStreamForAuth() = 0; - // After the response headers have been read and after the response body - // is complete, this function indicates if more data (either erroneous or - // as part of the next pipelined response) has been read from the socket. - virtual bool IsMoreDataBuffered() const = 0; - // Record histogram of number of round trips taken to download the full // response body vs bytes transferred. virtual void LogNumRttVsBytesMetrics() const = 0; diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc index 95f8cd0..2fbdd2a 100644 --- a/net/quic/quic_http_stream.cc +++ b/net/quic/quic_http_stream.cc @@ -197,10 +197,6 @@ bool QuicHttpStream::CanFindEndOfResponse() const { return true; } -bool QuicHttpStream::IsMoreDataBuffered() const { - return false; -} - bool QuicHttpStream::IsConnectionReused() const { // TODO(rch): do something smarter here. return stream_ && stream_->id() > 1; diff --git a/net/quic/quic_http_stream.h b/net/quic/quic_http_stream.h index f6dd5bb..3ecbc88 100644 --- a/net/quic/quic_http_stream.h +++ b/net/quic/quic_http_stream.h @@ -42,7 +42,6 @@ class NET_EXPORT_PRIVATE QuicHttpStream : 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; diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc index 8751efd..18fe35a 100644 --- a/net/quic/quic_http_stream_test.cc +++ b/net/quic/quic_http_stream_test.cc @@ -326,12 +326,6 @@ TEST_F(QuicHttpStreamTest, CanFindEndOfResponse) { EXPECT_TRUE(stream_->CanFindEndOfResponse()); } -TEST_F(QuicHttpStreamTest, IsMoreDataBuffered) { - AddWrite(SYNCHRONOUS, ConstructChloPacket()); - Initialize(); - EXPECT_FALSE(stream_->IsMoreDataBuffered()); -} - TEST_F(QuicHttpStreamTest, IsConnectionReusable) { AddWrite(SYNCHRONOUS, ConstructChloPacket()); Initialize(); diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc index fb76f4d..6b21435 100644 --- a/net/spdy/spdy_http_stream.cc +++ b/net/spdy/spdy_http_stream.cc @@ -188,10 +188,6 @@ bool SpdyHttpStream::CanFindEndOfResponse() const { return true; } -bool SpdyHttpStream::IsMoreDataBuffered() const { - return false; -} - bool SpdyHttpStream::IsConnectionReused() const { return spdy_session_->IsReused(); } diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h index a2d70d9..58b50f4 100644 --- a/net/spdy/spdy_http_stream.h +++ b/net/spdy/spdy_http_stream.h @@ -65,7 +65,6 @@ class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate, virtual HttpStream* RenewStreamForAuth() OVERRIDE; virtual bool IsResponseBodyComplete() const OVERRIDE; virtual bool CanFindEndOfResponse() const OVERRIDE; - virtual bool IsMoreDataBuffered() const OVERRIDE; // Must not be called if a NULL SpdySession was pssed into the // constructor. |