Landing Recent QUIC changes until 4/22/2016 14:55 UTC

net/net.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is shared between the regular GYP build, the NaCl GYP build, and
 # the GN build. For GN support, it must have no conditionals or anything like
 # that beyond the simple one-level-deep dictionary of values.
 {
   'variables': {
     # Subset of net source files that are compiled for NaCl (net_nacl target).
@@ skipping 238 matching lines @@
       'quic/congestion_control/tcp_cubic_sender_packets.cc',
       'quic/congestion_control/tcp_cubic_sender_packets.h',
       'quic/crypto/aead_base_decrypter.cc',
       'quic/crypto/aead_base_decrypter.h',
       'quic/crypto/aead_base_encrypter.cc',
       'quic/crypto/aead_base_encrypter.h',
       'quic/crypto/aes_128_gcm_12_decrypter.cc',
       'quic/crypto/aes_128_gcm_12_decrypter.h',
       'quic/crypto/aes_128_gcm_12_encrypter.cc',
       'quic/crypto/aes_128_gcm_12_encrypter.h',
-      'quic/crypto/chacha20_poly1305_rfc7539_decrypter.cc',
-      'quic/crypto/chacha20_poly1305_rfc7539_decrypter.h',
-      'quic/crypto/chacha20_poly1305_rfc7539_encrypter.cc',
-      'quic/crypto/chacha20_poly1305_rfc7539_encrypter.h',
+      'quic/crypto/chacha20_poly1305_decrypter.cc',
+      'quic/crypto/chacha20_poly1305_decrypter.h',
+      'quic/crypto/chacha20_poly1305_encrypter.cc',
+      'quic/crypto/chacha20_poly1305_encrypter.h',
       'quic/crypto/channel_id.cc',
       'quic/crypto/channel_id.h',
       'quic/crypto/channel_id_chromium.cc',
       'quic/crypto/channel_id_chromium.h',
       'quic/crypto/common_cert_set.cc',
       'quic/crypto/common_cert_set.h',
       'quic/crypto/crypto_framer.cc',
       'quic/crypto/crypto_framer.h',
       'quic/crypto/crypto_handshake.cc',
       'quic/crypto/crypto_handshake.h',
@@ skipping 1263 matching lines @@
       'quic/congestion_control/pacing_sender_test.cc',
       'quic/congestion_control/prr_sender_test.cc',
       'quic/congestion_control/rtt_stats_test.cc',
       'quic/congestion_control/send_algorithm_simulator.cc',
       'quic/congestion_control/send_algorithm_simulator.h',
       'quic/congestion_control/tcp_cubic_sender_bytes_test.cc',
       'quic/congestion_control/tcp_cubic_sender_packets_test.cc',
       'quic/crypto/aes_128_gcm_12_decrypter_test.cc',
       'quic/crypto/aes_128_gcm_12_encrypter_test.cc',
       'quic/crypto/cert_compressor_test.cc',
-      'quic/crypto/chacha20_poly1305_rfc7539_decrypter_test.cc',
-      'quic/crypto/chacha20_poly1305_rfc7539_encrypter_test.cc',
+      'quic/crypto/chacha20_poly1305_decrypter_test.cc',
+      'quic/crypto/chacha20_poly1305_encrypter_test.cc',
       'quic/crypto/channel_id_test.cc',
       'quic/crypto/common_cert_set_test.cc',
       'quic/crypto/crypto_framer_test.cc',
       'quic/crypto/crypto_handshake_message_test.cc',
       'quic/crypto/crypto_secret_boxer_test.cc',
       'quic/crypto/crypto_server_test.cc',
       'quic/crypto/crypto_utils_test.cc',
       'quic/crypto/curve25519_key_exchange_test.cc',
       'quic/crypto/local_strike_register_client_test.cc',
       'quic/crypto/null_decrypter_test.cc',
@@ skipping 241 matching lines @@
       'url_request/url_request_throttler_unittest.cc',
       'url_request/url_request_unittest.cc',
       'url_request/view_cache_helper_unittest.cc',
     ],
     'net_linux_test_sources': [
       'quic/quic_end_to_end_unittest.cc',
       'tools/quic/end_to_end_test.cc',
       'tools/quic/quic_client_session_test.cc',
       'tools/quic/quic_client_test.cc',
       'tools/quic/quic_dispatcher_test.cc',
+      'tools/quic/quic_epoll_alarm_factory_test.cc',
       'tools/quic/quic_epoll_clock_test.cc',
       'tools/quic/quic_epoll_connection_helper_test.cc',
       'tools/quic/quic_in_memory_cache_test.cc',
       'tools/quic/quic_server_session_base_test.cc',
       'tools/quic/quic_server_test.cc',
       'tools/quic/quic_simple_server_session_test.cc',
       'tools/quic/quic_simple_server_test.cc',
       'tools/quic/quic_spdy_client_stream_test.cc',
       'tools/quic/quic_time_wait_list_manager_test.cc',
       'tools/quic/spdy_balsa_utils_test.cc',
@@ skipping 1308 matching lines @@
       'third_party/nist-pkits/crls/requireExplicitPolicy5subCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy5subsubCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy5subsubsubCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7CACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subCARE2CRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl',
     ],
   }
 }