Land 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 733 matching lines @@
       'quic/congestion_control/hybrid_slow_start.cc',
       'quic/congestion_control/hybrid_slow_start.h',
       'quic/congestion_control/leaky_bucket.cc',
       'quic/congestion_control/leaky_bucket.h',
       'quic/congestion_control/loss_detection_interface.cc',
       'quic/congestion_control/loss_detection_interface.h',
       'quic/congestion_control/paced_sender.cc',
       'quic/congestion_control/paced_sender.h',
       'quic/congestion_control/pacing_sender.cc',
       'quic/congestion_control/pacing_sender.h',
-      'quic/congestion_control/quic_max_sized_map.h',
       'quic/congestion_control/receive_algorithm_interface.cc',
       'quic/congestion_control/receive_algorithm_interface.h',
       'quic/congestion_control/rtt_stats.cc',
       'quic/congestion_control/rtt_stats.h',
       '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',
@@ skipping 653 matching lines @@
       'proxy/proxy_script_fetcher_impl_unittest.cc',
       'proxy/proxy_server_unittest.cc',
       'proxy/proxy_service_unittest.cc',
       'quic/congestion_control/cube_root_test.cc',
       'quic/congestion_control/cubic_test.cc',
       'quic/congestion_control/fix_rate_test.cc',
       'quic/congestion_control/hybrid_slow_start_test.cc',
       'quic/congestion_control/leaky_bucket_test.cc',
       'quic/congestion_control/paced_sender_test.cc',
       'quic/congestion_control/pacing_sender_test.cc',
-      'quic/congestion_control/quic_max_sized_map_test.cc',
       'quic/congestion_control/rtt_stats_test.cc',
       '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/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',
@@ skipping 269 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',
     ],
   }
 }