Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: net/net.gyp

Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge bug Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_proxy_client_socket_pool_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
===================================================================
--- net/net.gyp (revision 124866)
+++ net/net.gyp (working copy)
@@ -1123,7 +1123,9 @@
'http/http_content_disposition_unittest.cc',
'http/http_mac_signature_unittest.cc',
'http/http_network_layer_unittest.cc',
- 'http/http_network_transaction_unittest.cc',
+ 'http/http_network_transaction_spdy3_unittest.cc',
+ 'http/http_network_transaction_spdy21_unittest.cc',
+ 'http/http_network_transaction_spdy2_unittest.cc',
'http/http_pipelined_connection_impl_unittest.cc',
'http/http_pipelined_host_forced_unittest.cc',
'http/http_pipelined_host_impl_unittest.cc',
@@ -1131,7 +1133,9 @@
'http/http_pipelined_host_test_util.cc',
'http/http_pipelined_host_test_util.h',
'http/http_pipelined_network_transaction_unittest.cc',
- 'http/http_proxy_client_socket_pool_unittest.cc',
+ 'http/http_proxy_client_socket_pool_spdy2_unittest.cc',
+ 'http/http_proxy_client_socket_pool_spdy21_unittest.cc',
+ 'http/http_proxy_client_socket_pool_spdy3_unittest.cc',
'http/http_request_headers_unittest.cc',
'http/http_response_body_drainer_unittest.cc',
'http/http_response_headers_unittest.cc',
@@ -1186,20 +1190,32 @@
'socket/web_socket_server_socket_unittest.cc',
'socket_stream/socket_stream_metrics_unittest.cc',
'socket_stream/socket_stream_unittest.cc',
- 'spdy/buffered_spdy_framer_unittest.cc',
+ 'spdy/buffered_spdy_framer_spdy3_unittest.cc',
+ 'spdy/buffered_spdy_framer_spdy2_unittest.cc',
'spdy/spdy_credential_state_unittest.cc',
'spdy/spdy_framer_test.cc',
- 'spdy/spdy_http_stream_unittest.cc',
- 'spdy/spdy_network_transaction_unittest.cc',
+ 'spdy/spdy_http_stream_spdy3_unittest.cc',
+ 'spdy/spdy_http_stream_spdy2_unittest.cc',
+ 'spdy/spdy_network_transaction_spdy3_unittest.cc',
+ 'spdy/spdy_network_transaction_spdy21_unittest.cc',
+ 'spdy/spdy_network_transaction_spdy2_unittest.cc',
'spdy/spdy_protocol_test.cc',
- 'spdy/spdy_proxy_client_socket_unittest.cc',
- 'spdy/spdy_session_unittest.cc',
- 'spdy/spdy_stream_unittest.cc',
- 'spdy/spdy_test_util.cc',
- 'spdy/spdy_test_util.h',
- 'spdy/spdy_websocket_stream_unittest.cc',
- 'spdy/spdy_websocket_test_util.cc',
- 'spdy/spdy_websocket_test_util.h',
+ 'spdy/spdy_proxy_client_socket_spdy3_unittest.cc',
+ 'spdy/spdy_proxy_client_socket_spdy2_unittest.cc',
+ 'spdy/spdy_session_spdy3_unittest.cc',
+ 'spdy/spdy_session_spdy2_unittest.cc',
+ 'spdy/spdy_stream_spdy3_unittest.cc',
+ 'spdy/spdy_stream_spdy2_unittest.cc',
+ 'spdy/spdy_test_util_spdy3.cc',
+ 'spdy/spdy_test_util_spdy3.h',
+ 'spdy/spdy_test_util_spdy2.cc',
+ 'spdy/spdy_test_util_spdy2.h',
+ 'spdy/spdy_websocket_stream_spdy2_unittest.cc',
+ 'spdy/spdy_websocket_stream_spdy3_unittest.cc',
+ 'spdy/spdy_websocket_test_util_spdy2.cc',
+ 'spdy/spdy_websocket_test_util_spdy2.h',
+ 'spdy/spdy_websocket_test_util_spdy3.cc',
+ 'spdy/spdy_websocket_test_util_spdy3.h',
'test/python_utils_unittest.cc',
'tools/dump_cache/url_to_filename_encoder.cc',
'tools/dump_cache/url_to_filename_encoder.h',
@@ -1217,7 +1233,8 @@
'url_request/url_request_unittest.cc',
'url_request/view_cache_helper_unittest.cc',
'websockets/websocket_handshake_handler_unittest.cc',
- 'websockets/websocket_job_unittest.cc',
+ 'websockets/websocket_job_spdy2_unittest.cc',
+ 'websockets/websocket_job_spdy3_unittest.cc',
'websockets/websocket_net_log_params_unittest.cc',
'websockets/websocket_throttle_unittest.cc',
],
« no previous file with comments | « net/http/http_proxy_client_socket_pool_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698