Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

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 1077 matching lines @@
       'quic/core/quic_time.cc',
       'quic/core/quic_time.h',
       'quic/core/quic_types.cc',
       'quic/core/quic_types.h',
       'quic/core/quic_unacked_packet_map.cc',
       'quic/core/quic_unacked_packet_map.h',
       'quic/core/quic_utils.cc',
       'quic/core/quic_utils.h',
       'quic/core/quic_write_blocked_list.cc',
       'quic/core/quic_write_blocked_list.h',
-      'quic/core/reliable_quic_stream.cc',
-      'quic/core/reliable_quic_stream.h',
+      'quic/core/quic_stream.cc',
+      'quic/core/quic_stream.h',
       'quic/core/quic_server_session_base.cc',
       'quic/core/quic_server_session_base.h',
       'quic/core/spdy_utils.cc',
       'quic/core/spdy_utils.h',
       'quic/quartc/quartc_alarm_factory.cc',
       'quic/quartc/quartc_alarm_factory.h',
       'quic/quartc/quartc_factory.cc',
       'quic/quartc/quartc_factory.h',
       'quic/quartc/quartc_factory_interface.h',
       'quic/quartc/quartc_packet_writer.cc',
@@ skipping 640 matching lines @@
       'quic/core/quic_session_test.cc',
       'quic/core/quic_simple_buffer_allocator_test.cc',
       'quic/core/quic_socket_address_coder_test.cc',
       'quic/core/quic_spdy_stream_test.cc',
       'quic/core/quic_stream_sequencer_test.cc',
       'quic/core/quic_sustained_bandwidth_recorder_test.cc',
       'quic/core/quic_time_test.cc',
       'quic/core/quic_unacked_packet_map_test.cc',
       'quic/core/quic_utils_test.cc',
       'quic/core/quic_write_blocked_list_test.cc',
-      'quic/core/reliable_quic_stream_test.cc',
+      'quic/core/quic_stream_test.cc',
       'quic/core/spdy_utils_test.cc',
       'quic/core/quic_stream_sequencer_buffer_test.cc',
       'quic/quartc/quartc_alarm_factory_test.cc',
       'quic/quartc/quartc_session_test.cc',
       'quic/quartc/quartc_stream_test.cc',
       'quic/test_tools/crypto_test_utils.cc',
       'quic/test_tools/crypto_test_utils.h',
       'quic/test_tools/crypto_test_utils_test.cc',
       'quic/test_tools/delayed_verify_strike_register_client.cc',
       'quic/test_tools/delayed_verify_strike_register_client.h',
@@ skipping 53 matching lines @@
       '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/quic_test_utils_test.cc',
       'quic/test_tools/quic_time_wait_list_manager_peer.cc',
       'quic/test_tools/quic_time_wait_list_manager_peer.h',
-      'quic/test_tools/reliable_quic_stream_peer.cc',
-      'quic/test_tools/reliable_quic_stream_peer.h',
+      'quic/test_tools/quic_stream_peer.cc',
+      'quic/test_tools/quic_stream_peer.h',
       'quic/test_tools/rtt_stats_peer.cc',
       'quic/test_tools/rtt_stats_peer.h',
       'quic/test_tools/simple_quic_framer.cc',
       'quic/test_tools/simple_quic_framer.h',
       'quic/test_tools/simulator/actor.cc',
       'quic/test_tools/simulator/actor.h',
       'quic/test_tools/simulator/alarm_factory.cc',
       'quic/test_tools/simulator/alarm_factory.h',
       'quic/test_tools/simulator/link.cc',
       'quic/test_tools/simulator/link.h',
@@ skipping 1457 matching lines @@
       'third_party/nist-pkits/crls/requireExplicitPolicy5subCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy5subsubCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy5subsubsubCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7CACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subCARE2CRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl',
     ],
   }
 }