summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_proxy_client_socket_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-30 01:22:57 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-30 01:22:57 +0000
commita1f1cb2cbab36077059266a1e5141104fd2ec995 (patch)
tree6c8f10eedeb5e10ae6af77b68002c268601e9d52 /net/spdy/spdy_proxy_client_socket_unittest.cc
parentaa3be97db621ecfb620487f2a0f4f0c4529c0668 (diff)
downloadchromium_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_proxy_client_socket_unittest.cc')
-rw-r--r--net/spdy/spdy_proxy_client_socket_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index b2bdb3e..c128d9c 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -140,7 +140,8 @@ class SpdyProxyClientSocketTest
INSTANTIATE_TEST_CASE_P(
NextProto,
SpdyProxyClientSocketTest,
- testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2));
+ testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2,
+ kProtoHTTP2Draft04));
SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
: spdy_util_(GetParam()),