diff options
| author | ttuttle@chromium.org <ttuttle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 03:39:37 +0000 |
|---|---|---|
| committer | ttuttle@chromium.org <ttuttle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 03:39:37 +0000 |
| commit | 1723f69c138899c85816fdad68e6f200604cb26f (patch) | |
| tree | cfb32e860c454cec980e0d3678cea0566577c169 /net/net.gyp | |
| parent | 496c248faafb9c4f1be3c1829bdb496ad6e5c7ba (diff) | |
| download | chromium_src-1723f69c138899c85816fdad68e6f200604cb26f.zip chromium_src-1723f69c138899c85816fdad68e6f200604cb26f.tar.gz chromium_src-1723f69c138899c85816fdad68e6f200604cb26f.tar.bz2 | |
Merge SpdyProxyClientSocket unittests.
Now that we've got the proper subset of functions merged into SpdyTestUtil,
merge spdy_proxy_client_socket_spdy[23]_unittest into a single unittest.
BUG=226192
Review URL: https://chromiumcodereview.appspot.com/14772037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200434 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 656a2b4..41775bd 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1738,8 +1738,7 @@ 'spdy/spdy_network_transaction_spdy2_unittest.cc', 'spdy/spdy_priority_forest_test.cc', 'spdy/spdy_protocol_test.cc', - 'spdy/spdy_proxy_client_socket_spdy3_unittest.cc', - 'spdy/spdy_proxy_client_socket_spdy2_unittest.cc', + 'spdy/spdy_proxy_client_socket_unittest.cc', 'spdy/spdy_read_queue_unittest.cc', 'spdy/spdy_session_spdy3_unittest.cc', 'spdy/spdy_session_spdy2_unittest.cc', |