diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 03:38:43 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 03:38:43 +0000 |
| commit | 6fe2e9952f1eb1ca1e52bb1f1080577f10772474 (patch) | |
| tree | 66a591f3884a3e7b427246cc8a6cbdeef49be035 /net/net.gyp | |
| parent | 1ead4aab1101e2c48b2c65a83dd8c873b253871b (diff) | |
| download | chromium_src-6fe2e9952f1eb1ca1e52bb1f1080577f10772474.zip chromium_src-6fe2e9952f1eb1ca1e52bb1f1080577f10772474.tar.gz chromium_src-6fe2e9952f1eb1ca1e52bb1f1080577f10772474.tar.bz2 | |
[SPDY] Merge the SpdyHttpStream unit tests and parametrize them on a NextProto
Add (partial) support for SPDY/3.1 and SPDY/4a2 for SpdyHttpStream
unit tests.
BUG=226192
R=rch@chromium.org
Review URL: https://codereview.chromium.org/16705004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/net.gyp b/net/net.gyp index 62839f2..096dab0 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1754,8 +1754,7 @@ 'spdy/spdy_frame_reader_test.cc', 'spdy/spdy_framer_test.cc', 'spdy/spdy_header_block_unittest.cc', - 'spdy/spdy_http_stream_spdy3_unittest.cc', - 'spdy/spdy_http_stream_spdy2_unittest.cc', + 'spdy/spdy_http_stream_unittest.cc', 'spdy/spdy_http_utils_unittest.cc', 'spdy/spdy_network_transaction_spdy3_unittest.cc', 'spdy/spdy_network_transaction_spdy2_unittest.cc', |