Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
diff --git a/net/net.gyp b/net/net.gyp
index a779c56..5a0bc49 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -409,6 +409,7 @@
'disk_cache/flash/segment.h',
'disk_cache/flash/storage.cc',
'disk_cache/flash/storage.h',
+ 'disk_cache/v3/disk_format_v3.h',
'dns/address_sorter.h',
'dns/address_sorter_posix.cc',
'dns/address_sorter_posix.h',
@@ -446,6 +447,10 @@
'dns/mapped_host_resolver.h',
'dns/mdns_cache.cc',
'dns/mdns_cache.h',
+ 'dns/mdns_client.cc',
+ 'dns/mdns_client.h',
+ 'dns/mdns_client_impl.cc',
+ 'dns/mdns_client_impl.h',
'dns/notify_watcher_mac.cc',
'dns/notify_watcher_mac.h',
'dns/record_parsed.cc',
@@ -1313,6 +1318,10 @@
'sources!' : [
'dns/mdns_cache.cc',
'dns/mdns_cache.h',
+ 'dns/mdns_client.cc',
+ 'dns/mdns_client.h',
+ 'dns/mdns_client_impl.cc',
+ 'dns/mdns_client_impl.h',
'dns/record_parsed.cc',
'dns/record_parsed.h',
'dns/record_rdata.cc',
@@ -1543,6 +1552,7 @@
'dns/host_resolver_impl_unittest.cc',
'dns/mapped_host_resolver_unittest.cc',
'dns/mdns_cache_unittest.cc',
+ 'dns/mdns_client_unittest.cc',
'dns/serial_worker_unittest.cc',
'dns/record_parsed_unittest.cc',
'dns/record_rdata_unittest.cc',
@@ -1577,8 +1587,7 @@
'http/http_chunked_decoder_unittest.cc',
'http/http_content_disposition_unittest.cc',
'http/http_network_layer_unittest.cc',
- 'http/http_network_transaction_spdy3_unittest.cc',
- 'http/http_network_transaction_spdy2_unittest.cc',
+ 'http/http_network_transaction_unittest.cc',
'http/http_network_transaction_ssl_unittest.cc',
'http/http_pipelined_connection_impl_unittest.cc',
'http/http_pipelined_host_forced_unittest.cc',
@@ -1754,22 +1763,19 @@
'spdy/spdy_frame_reader_test.cc',
'spdy/spdy_framer_test.cc',
'spdy/spdy_header_block_unittest.cc',
- 'spdy/spdy_http_stream_spdy3_unittest.cc',
- 'spdy/spdy_http_stream_spdy2_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',
'spdy/spdy_read_queue_unittest.cc',
- 'spdy/spdy_session_spdy3_unittest.cc',
- 'spdy/spdy_session_spdy2_unittest.cc',
'spdy/spdy_session_test_util.cc',
'spdy/spdy_session_test_util.h',
- 'spdy/spdy_stream_unittest.cc',
+ 'spdy/spdy_session_unittest.cc',
'spdy/spdy_stream_test_util.cc',
'spdy/spdy_stream_test_util.h',
+ 'spdy/spdy_stream_unittest.cc',
'spdy/spdy_test_util_common.cc',
'spdy/spdy_test_util_common.h',
'spdy/spdy_test_util_spdy3.cc',
@@ -1950,6 +1956,8 @@
[ 'enable_mdns != 1', {
'sources!' : [
'dns/mdns_cache_unittest.cc',
+ 'dns/mdns_client_unittest.cc',
+ 'dns/mdns_query_unittest.cc',
'dns/record_parsed_unittest.cc',
'dns/record_rdata_unittest.cc',
],
@@ -2724,6 +2732,12 @@
'tools/quic/test_tools/run_all_unittests.cc',
],
'conditions': [
+ [ 'use_glib == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:ssl',
+ ],
+ },
+ ],
[ 'use_openssl==1', {
# When building for OpenSSL, we need to exclude NSS specific tests.
'sources!': [