summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 08:08:03 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 08:08:03 +0000
commite089f385c13b8ee10a0d6c2e3c4816572cd78e5a (patch)
treeeca65f7673854271713bd7b384f2f79852781ffb /net/spdy
parent97d82ed17e163035e9dd9c493e5695512523a37b (diff)
downloadchromium_src-e089f385c13b8ee10a0d6c2e3c4816572cd78e5a.zip
chromium_src-e089f385c13b8ee10a0d6c2e3c4816572cd78e5a.tar.gz
chromium_src-e089f385c13b8ee10a0d6c2e3c4816572cd78e5a.tar.bz2
Revert 77077 - Fix clang after r77075.
BUG=none TEST=builds Review URL: http://codereview.chromium.org/6626044 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/6621039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_http_stream.cc4
-rw-r--r--net/spdy/spdy_http_stream.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index 130a818..51a2efd 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -463,8 +463,4 @@ void SpdyHttpStream::GetSSLCertRequestInfo(
stream_->GetSSLCertRequestInfo(cert_request_info);
}
-bool SpdyHttpStream::IsSpdyHttpStream() const {
- return true;
-}
-
} // namespace net
diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h
index 4c00e0f..c165b21 100644
--- a/net/spdy/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.h
@@ -65,7 +65,7 @@ class SpdyHttpStream : public SpdyStream::Delegate, public HttpStream {
virtual void SetConnectionReused();
virtual void GetSSLInfo(SSLInfo* ssl_info);
virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
- virtual bool IsSpdyHttpStream() const;
+ virtual bool IsSpdyHttpStream() const { return true; }
// SpdyStream::Delegate methods:
virtual bool OnSendHeadersComplete(int status);