Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
diff --git a/net/net.gyp b/net/net.gyp
index 5d5c131..b97c69f 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -394,6 +394,8 @@
'disk_cache/simple/simple_index.h',
'disk_cache/simple/simple_index_file.cc',
'disk_cache/simple/simple_index_file.h',
+ 'disk_cache/simple/simple_net_log_parameters.cc',
+ 'disk_cache/simple/simple_net_log_parameters.h',
'disk_cache/simple/simple_synchronous_entry.cc',
'disk_cache/simple/simple_synchronous_entry.h',
'disk_cache/simple/simple_util.cc',
@@ -758,6 +760,8 @@
'quic/crypto/p256_key_exchange_nss.cc',
'quic/crypto/p256_key_exchange_openssl.cc',
'quic/crypto/proof_source.h',
+ 'quic/crypto/proof_source_chromium.cc',
+ 'quic/crypto/proof_source_chromium.h',
'quic/crypto/proof_verifier_chromium.cc',
'quic/crypto/proof_verifier_chromium.h',
'quic/crypto/quic_decrypter.cc',
@@ -1537,6 +1541,8 @@
'disk_cache/mapped_file_unittest.cc',
'disk_cache/simple/simple_index_file_unittest.cc',
'disk_cache/simple/simple_index_unittest.cc',
+ 'disk_cache/simple/simple_test_util.h',
+ 'disk_cache/simple/simple_test_util.cc',
'disk_cache/simple/simple_util_unittest.cc',
'disk_cache/storage_block_unittest.cc',
'disk_cache/flash/log_store_entry_unittest.cc',
@@ -1774,6 +1780,7 @@
'spdy/spdy_protocol_test.cc',
'spdy/spdy_proxy_client_socket_unittest.cc',
'spdy/spdy_read_queue_unittest.cc',
+ 'spdy/spdy_session_pool_unittest.cc',
'spdy/spdy_session_test_util.cc',
'spdy/spdy_session_test_util.h',
'spdy/spdy_session_unittest.cc',
@@ -2038,12 +2045,10 @@
'cookies/cookie_store_unittest.h',
'http/http_auth_controller_unittest.cc',
'http/http_network_layer_unittest.cc',
- 'http/http_network_transaction_spdy2_unittest.cc',
- 'http/http_network_transaction_spdy3_unittest.cc',
- 'spdy/spdy_http_stream_spdy2_unittest.cc',
- 'spdy/spdy_http_stream_spdy3_unittest.cc',
- 'spdy/spdy_proxy_client_socket_spdy3_unittest.cc',
- 'spdy/spdy_session_spdy3_unittest.cc',
+ 'http/http_network_transaction_unittest.cc',
+ 'spdy/spdy_http_stream_unittest.cc',
+ 'spdy/spdy_proxy_client_socket_unittest.cc',
+ 'spdy/spdy_session_unittest.cc',
# These tests crash when run with coverage turned on:
# http://crbug.com/177203
@@ -2915,29 +2920,11 @@
'net_unittests',
],
'includes': [
+ '../build/isolate.gypi',
'net_unittests.isolate',
],
- 'actions': [
- {
- 'action_name': 'isolate',
- 'inputs': [
- 'net_unittests.isolate',
- '<@(isolate_dependency_tracked)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/net_unittests.isolated',
- ],
- 'action': [
- 'python',
- '../tools/swarm_client/isolate.py',
- '<(test_isolation_mode)',
- '--outdir', '<(test_isolation_outdir)',
- '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
- '--variable', 'OS', '<(OS)',
- '--result', '<@(_outputs)',
- '--isolate', 'net_unittests.isolate',
- ],
- },
+ 'sources': [
+ 'net_unittests.isolate',
],
},
],