Land Recent QUIC changes.

net/net.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 792 matching lines @@
         'quic/quic_data_writer.cc',
         'quic/quic_data_writer.h',
         'quic/quic_fec_group.cc',
         'quic/quic_fec_group.h',
         'quic/quic_framer.cc',
         'quic/quic_framer.h',
         'quic/quic_http_stream.cc',
         'quic/quic_http_stream.h',
         'quic/quic_packet_creator.cc',
         'quic/quic_packet_creator.h',
-        'quic/quic_packet_entropy_manager.cc',
-        'quic/quic_packet_entropy_manager.h',
         'quic/quic_packet_generator.cc',
         'quic/quic_packet_generator.h',
         'quic/quic_protocol.cc',
         'quic/quic_protocol.h',
+        'quic/quic_received_entropy_manager.cc',
+        'quic/quic_received_entropy_manager.h',
         'quic/quic_reliable_client_stream.cc',
         'quic/quic_reliable_client_stream.h',
+        'quic/quic_sent_entropy_manager.cc',
+        'quic/quic_sent_entropy_manager.h',
         'quic/quic_session.cc',
         'quic/quic_session.h',
         'quic/quic_spdy_compressor.cc',
         'quic/quic_spdy_compressor.h',
         'quic/quic_spdy_decompressor.cc',
         'quic/quic_spdy_decompressor.h',
         'quic/quic_stats.cc',
         'quic/quic_stats.h',
         'quic/quic_stream_factory.cc',
         'quic/quic_stream_factory.h',
@@ skipping 898 matching lines @@
         'quic/quic_connection_test.cc',
         'quic/quic_crypto_client_stream_test.cc',
         'quic/quic_crypto_server_stream_test.cc',
         'quic/quic_crypto_stream_test.cc',
         'quic/quic_data_writer_test.cc',
         'quic/quic_fec_group_test.cc',
         'quic/quic_framer_test.cc',
         'quic/quic_http_stream_test.cc',
         'quic/quic_network_transaction_unittest.cc',
         'quic/quic_packet_creator_test.cc',
-        'quic/quic_packet_entropy_manager_test.cc',
         'quic/quic_packet_generator_test.cc',
         'quic/quic_protocol_test.cc',
+        'quic/quic_received_entropy_manager_test.cc',
         'quic/quic_reliable_client_stream_test.cc',
+        'quic/quic_sent_entropy_manager_test.cc',
         'quic/quic_session_test.cc',
         'quic/quic_spdy_compressor_test.cc',
         'quic/quic_spdy_decompressor_test.cc',
         'quic/quic_stream_factory_test.cc',
         'quic/quic_stream_sequencer_test.cc',
         'quic/quic_time_test.cc',
         'quic/quic_utils_test.cc',
         'quic/reliable_quic_stream_test.cc',
         'server/http_server_response_info_unittest.cc',
         'socket/buffered_write_stream_socket_unittest.cc',
@@ skipping 1128 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }