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

net/net.gypi

Index: net/net.gypi
diff --git a/net/net.gypi b/net/net.gypi
index 7407c2e7946615298ac5171f92cbdbe0dd84288e..466eb5c8de39c67f70cd7fbfb3aff0b1d1ab475d 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -1095,8 +1095,8 @@
       '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',
@@ -1757,7 +1757,7 @@
       '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',
@@ -1831,8 +1831,8 @@
       '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',