From 513963e754d3b174889b58919c81f49f7b920705 Mon Sep 17 00:00:00 2001 From: "akalin@chromium.org" Date: Sat, 15 Jun 2013 01:53:04 +0000 Subject: 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 --- net/net.gyp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'net/net.gyp') 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', -- cgit v1.1