diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 01:53:04 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 01:53:04 +0000 |
| commit | 513963e754d3b174889b58919c81f49f7b920705 (patch) | |
| tree | 5855c54a749fedc2a7fc668c817c8d8487d58095 /net/net.gyp | |
| parent | 9021c61baa18ecef07ced6c6ba4e4ed5cf3c2c15 (diff) | |
| download | chromium_src-513963e754d3b174889b58919c81f49f7b920705.zip chromium_src-513963e754d3b174889b58919c81f49f7b920705.tar.gz chromium_src-513963e754d3b174889b58919c81f49f7b920705.tar.bz2 | |
Merge the SpdyNetworkTransaction tests and parametrize them on a NextProto
BUG=226192
R=rch@chromium.org
Review URL: https://codereview.chromium.org/16816010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206536 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 df69284..c82af14 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1765,8 +1765,7 @@ 'spdy/spdy_header_block_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', + 'spdy/spdy_network_transaction_unittest.cc', 'spdy/spdy_priority_forest_test.cc', 'spdy/spdy_protocol_test.cc', 'spdy/spdy_proxy_client_socket_unittest.cc', |