diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 01:22:57 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 01:22:57 +0000 |
| commit | a1f1cb2cbab36077059266a1e5141104fd2ec995 (patch) | |
| tree | 6c8f10eedeb5e10ae6af77b68002c268601e9d52 /net/spdy/spdy_stream.cc | |
| parent | aa3be97db621ecfb620487f2a0f4f0c4529c0668 (diff) | |
| download | chromium_src-a1f1cb2cbab36077059266a1e5141104fd2ec995.zip chromium_src-a1f1cb2cbab36077059266a1e5141104fd2ec995.tar.gz chromium_src-a1f1cb2cbab36077059266a1e5141104fd2ec995.tar.bz2 | |
[SPDY] Add strings and constants for HTTP/2 draft 04
There are still differences between SPDY/4 and HTTP/2 draft 04; those
will be ironed out in upcoming CLs.
Add kProtoHTTP2Draft04 to SPDY NextProto-parametrized tests.
Move NextProto -> SpdyMajorVersion conversion to buffered_spdy_framer.h.
Remove unused SpdyMajorVersion -> NextProto conversion.
Clean up HttpResponseInfo::ConnectionInfo a bit and add a TODO to
remove it.
Parametrize SSLClientSocketPoolTest on NextProto.
BUG=265615
R=darin@chromium.org, rch@chromium.org
Review URL: https://codereview.chromium.org/21131002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_stream.cc')
| -rw-r--r-- | net/spdy/spdy_stream.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc index 63d6a68..db085cf 100644 --- a/net/spdy/spdy_stream.cc +++ b/net/spdy/spdy_stream.cc @@ -630,6 +630,10 @@ bool SpdyStream::IsIdle() const { return io_state_ == STATE_IDLE; } +NextProto SpdyStream::GetProtocol() const { + return session_->protocol(); +} + bool SpdyStream::GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const { if (stream_id_ == 0) return false; |