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 881 matching lines @@
       'quic/quic_data_stream.cc',
       'quic/quic_data_stream.h',
       'quic/quic_data_writer.cc',
       'quic/quic_data_writer.h',
       'quic/quic_default_packet_writer.cc',
       'quic/quic_default_packet_writer.h',
       'quic/quic_fec_group.cc',
       'quic/quic_fec_group.h',
       'quic/quic_flags.cc',
       'quic/quic_flags.h',
+      'quic/quic_flow_controller.cc',
+      'quic/quic_flow_controller.h',
       'quic/quic_framer.cc',
       'quic/quic_framer.h',
       'quic/quic_headers_stream.cc',
       'quic/quic_headers_stream.h',
       'quic/quic_http_stream.cc',
       'quic/quic_http_stream.h',
       'quic/quic_http_utils.cc',
       'quic/quic_http_utils.h',
       'quic/quic_packet_creator.cc',
       'quic/quic_packet_creator.h',
@@ skipping 565 matching lines @@
       'quic/test_tools/mock_crypto_client_stream_factory.cc',
       'quic/test_tools/mock_crypto_client_stream_factory.h',
       'quic/test_tools/mock_random.cc',
       'quic/test_tools/mock_random.h',
       'quic/test_tools/quic_client_session_peer.cc',
       'quic/test_tools/quic_client_session_peer.h',
       'quic/test_tools/quic_connection_peer.cc',
       'quic/test_tools/quic_connection_peer.h',
       'quic/test_tools/quic_data_stream_peer.cc',
       'quic/test_tools/quic_data_stream_peer.h',
+      'quic/test_tools/quic_flow_controller_peer.cc',
+      'quic/test_tools/quic_flow_controller_peer.h',
       'quic/test_tools/quic_framer_peer.cc',
       'quic/test_tools/quic_framer_peer.h',
       'quic/test_tools/quic_packet_creator_peer.cc',
       'quic/test_tools/quic_packet_creator_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',
@@ skipping 15 matching lines @@
       'quic/quic_clock_test.cc',
       'quic/quic_config_test.cc',
       'quic/quic_connection_helper_test.cc',
       '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_stream_test.cc',
       'quic/quic_data_writer_test.cc',
       'quic/quic_fec_group_test.cc',
+      'quic/quic_flow_controller_test.cc',
       'quic/quic_framer_test.cc',
       'quic/quic_headers_stream_test.cc',
       'quic/quic_http_stream_test.cc',
       'quic/quic_http_utils_test.cc',
       'quic/quic_network_transaction_unittest.cc',
       'quic/quic_packet_creator_test.cc',
       'quic/quic_packet_generator_test.cc',
       'quic/quic_protocol_test.cc',
       'quic/quic_received_packet_manager_test.cc',
       'quic/quic_reliable_client_stream_test.cc',
@@ skipping 178 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',
     ],
   }
 }