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

Unified Diff: net/net.gypi

Issue 1918953003: Landing Recent QUIC changes until 4/22/2016 14:55 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Deleted SpdyFramerTests missed while mergeing 120451808 Created 4 years, 8 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 | « no previous file | net/quic/congestion_control/general_loss_algorithm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gypi
diff --git a/net/net.gypi b/net/net.gypi
index a1a6aa9c989b36e184a77f225e601f6eeb5f33c8..eaeec597c37eab8cc2850dca4084666d64776822 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -256,10 +256,10 @@
'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',
@@ -1543,8 +1543,8 @@
'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',
@@ -1806,6 +1806,7 @@
'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',
« no previous file with comments | « no previous file | net/quic/congestion_control/general_loss_algorithm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698