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 742 matching lines @@
       'proxy/proxy_script_decider.cc',
       'proxy/proxy_script_decider.h',
       'proxy/proxy_script_fetcher.h',
       'proxy/proxy_script_fetcher_impl.cc',
       'proxy/proxy_script_fetcher_impl.h',
       'proxy/proxy_server.cc',
       'proxy/proxy_server.h',
       'proxy/proxy_server_mac.cc',
       'proxy/proxy_service.cc',
       'proxy/proxy_service.h',
-      'quic/congestion_control/cube_root.cc',
-      'quic/congestion_control/cube_root.h',
       'quic/congestion_control/cubic.cc',
       'quic/congestion_control/cubic.h',
       'quic/congestion_control/hybrid_slow_start.cc',
       'quic/congestion_control/hybrid_slow_start.h',
       'quic/congestion_control/loss_detection_interface.cc',
       'quic/congestion_control/loss_detection_interface.h',
       'quic/congestion_control/pacing_sender.cc',
       'quic/congestion_control/pacing_sender.h',
       'quic/congestion_control/prr_sender.cc',
       'quic/congestion_control/prr_sender.h',
@@ skipping 671 matching lines @@
       'proxy/proxy_config_service_win_unittest.cc',
       'proxy/proxy_config_unittest.cc',
       'proxy/proxy_info_unittest.cc',
       'proxy/proxy_list_unittest.cc',
       'proxy/proxy_resolver_v8_tracing_unittest.cc',
       'proxy/proxy_resolver_v8_unittest.cc',
       'proxy/proxy_script_decider_unittest.cc',
       '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/hybrid_slow_start_test.cc',
       'quic/congestion_control/pacing_sender_test.cc',
       'quic/congestion_control/prr_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/time_loss_algorithm_test.cc',
@@ skipping 302 matching lines @@
     ],
     'net_base_mac_ios_sources': [
       'base/mac/url_conversions.h',
       'base/mac/url_conversions.mm',
     ],
     'net_base_test_mac_ios_sources': [
       'base/mac/url_conversions_unittest.mm',
     ],
   }
 }