Landing Recent QUIC Changes.

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 741 matching lines @@
       'quic/congestion_control/send_algorithm_interface.cc',
       'quic/congestion_control/send_algorithm_interface.h',
       'quic/congestion_control/tcp_cubic_sender.cc',
       'quic/congestion_control/tcp_cubic_sender.h',
       'quic/congestion_control/tcp_loss_algorithm.cc',
       'quic/congestion_control/tcp_loss_algorithm.h',
       'quic/congestion_control/tcp_receiver.cc',
       'quic/congestion_control/tcp_receiver.h',
       'quic/congestion_control/time_loss_algorithm.cc',
       'quic/congestion_control/time_loss_algorithm.h',
-      'quic/congestion_control/timestamp_receiver.cc',
-      'quic/congestion_control/timestamp_receiver.h',
       'quic/crypto/aead_base_decrypter.h',
       'quic/crypto/aead_base_decrypter_nss.cc',
       'quic/crypto/aead_base_decrypter_openssl.cc',
       'quic/crypto/aead_base_encrypter.h',
       'quic/crypto/aead_base_encrypter_nss.cc',
       'quic/crypto/aead_base_encrypter_openssl.cc',
       'quic/crypto/aes_128_gcm_12_decrypter.h',
       'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
       'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
       'quic/crypto/aes_128_gcm_12_encrypter.h',
@@ skipping 659 matching lines @@
       'quic/congestion_control/hybrid_slow_start_test.cc',
       'quic/congestion_control/leaky_bucket_test.cc',
       'quic/congestion_control/pacing_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_test.cc',
       'quic/congestion_control/tcp_loss_algorithm_test.cc',
       'quic/congestion_control/tcp_receiver_test.cc',
       'quic/congestion_control/time_loss_algorithm_test.cc',
-      'quic/congestion_control/timestamp_receiver_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_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_secret_boxer_test.cc',
       'quic/crypto/crypto_server_test.cc',
@@ skipping 44 matching lines @@
       'quic/test_tools/quic_packet_generator_peer.cc',
       'quic/test_tools/quic_packet_generator_peer.h',
       'quic/test_tools/quic_received_packet_manager_peer.cc',
       'quic/test_tools/quic_received_packet_manager_peer.h',
       'quic/test_tools/quic_sent_packet_manager_peer.cc',
       'quic/test_tools/quic_sent_packet_manager_peer.h',
       'quic/test_tools/quic_session_peer.cc',
       'quic/test_tools/quic_session_peer.h',
       'quic/test_tools/quic_stream_sequencer_peer.cc',
       'quic/test_tools/quic_stream_sequencer_peer.h',
+      'quic/test_tools/quic_sustained_bandwidth_recorder_peer.cc',
+      'quic/test_tools/quic_sustained_bandwidth_recorder_peer.h',
       'quic/test_tools/quic_test_packet_maker.cc',
       'quic/test_tools/quic_test_packet_maker.h',
       'quic/test_tools/quic_test_utils.cc',
       'quic/test_tools/quic_test_utils.h',
       'quic/test_tools/reliable_quic_stream_peer.cc',
       'quic/test_tools/reliable_quic_stream_peer.h',
       'quic/test_tools/simple_quic_framer.cc',
       'quic/test_tools/simple_quic_framer.h',
       'quic/test_tools/test_task_runner.cc',
       'quic/test_tools/test_task_runner.h',
@@ skipping 216 matching lines @@
       'tools/quic/test_tools/quic_test_client.h',
       'tools/quic/test_tools/quic_test_utils.cc',
       'tools/quic/test_tools/quic_test_utils.h',
       'tools/quic/test_tools/server_thread.h',
       'tools/quic/test_tools/server_thread.cc',
       'tools/quic/test_tools/simple_client.h',
       'tools/quic/test_tools/simple_client.cc',
     ],
   }
 }