summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 09:15:37 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 09:15:37 +0000
commit257f24fb9b8d3a232406f11b0f7a137659d11565 (patch)
tree5b9e726302dd618a785f64577b2e76feef2bbde3 /net/net.gyp
parent275e485af3ba80248267aefab70a14e277768678 (diff)
downloadchromium_src-257f24fb9b8d3a232406f11b0f7a137659d11565.zip
chromium_src-257f24fb9b8d3a232406f11b0f7a137659d11565.tar.gz
chromium_src-257f24fb9b8d3a232406f11b0f7a137659d11565.tar.bz2
Land Recent QUIC Changes.
Refactor hybrid slow start in QUIC to create a simpler interface between it an TCPCubicSender. In preparation for BBR. Merge internal change: 64031462 https://codereview.chromium.org/218993002/ Don't log decryption errors in AeadBaseDecrypter::Decrypt. Instead, have QuicFramer::DecryptPayload log a warning message if both trial decryptions fail. Merge internal change: 63977728 https://codereview.chromium.org/218983002/ QUIC refactor to remove a return value which was always true. Merge internal change: 63977684 https://codereview.chromium.org/218913003/ Simplify the bytes_consumed computation in QuicPacketCreator::CreateStreamFrame. Does not change behavior. Merge internal change: 63900899 https://codereview.chromium.org/218873003/ Fixing a broken test for quic. cr/63542972 added the proxy flag on outbound packets. Unfortunately, this broke our tests using the magic header. This CL provides hooks for clearing that bit of data. Adding a virtual function to quic client so we can fix a test. Merge internal change: 63898585 https://codereview.chromium.org/218963003/ + Use QuicServerKey tuple (host, port, is_https) instead of server_hostname, while creating QuicClientSession, QuicCryptoClientStream, QuicCryptoClientConfig, QuicClient, QuicTestClient, etc objects. + QuicServerKey is used as the key to access QUIC server config information from all caches. + Added couple of new unit tests for HostPortPair class. + Added unit tests for QuicServerId for privacy mode combination with host, port, is_https. Merge internal change: 63891842 https://codereview.chromium.org/218923002/ R=rch@chromium.org Review URL: https://codereview.chromium.org/216713003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 4d7a780..167935e 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -936,10 +936,10 @@
'quic/quic_sent_entropy_manager.h',
'quic/quic_sent_packet_manager.cc',
'quic/quic_sent_packet_manager.h',
+ 'quic/quic_server_id.cc',
+ 'quic/quic_server_id.h',
'quic/quic_session.cc',
'quic/quic_session.h',
- 'quic/quic_session_key.cc',
- 'quic/quic_session_key.h',
'quic/quic_socket_address_coder.cc',
'quic/quic_socket_address_coder.h',
'quic/quic_stream_factory.cc',
@@ -1988,7 +1988,7 @@
'quic/quic_reliable_client_stream_test.cc',
'quic/quic_sent_entropy_manager_test.cc',
'quic/quic_sent_packet_manager_test.cc',
- 'quic/quic_session_key_test.cc',
+ 'quic/quic_server_id_test.cc',
'quic/quic_session_test.cc',
'quic/quic_socket_address_coder_test.cc',
'quic/quic_stream_factory_test.cc',