Land Recent QUIC Changes.

net/net.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 895 matching lines @@
         'quic/quic_spdy_decompressor.cc',
         'quic/quic_spdy_decompressor.h',
         'quic/quic_stream_factory.cc',
         'quic/quic_stream_factory.h',
         'quic/quic_stream_sequencer.cc',
         'quic/quic_stream_sequencer.h',
         'quic/quic_time.cc',
         'quic/quic_time.h',
         'quic/quic_utils.cc',
         'quic/quic_utils.h',
+        'quic/quic_write_blocked_list.cc',
+        'quic/quic_write_blocked_list.h',
         'quic/reliable_quic_stream.cc',
         'quic/reliable_quic_stream.h',
         'quic/spdy_utils.cc',
         'quic/spdy_utils.h',
         'socket/buffered_write_stream_socket.cc',
         'socket/buffered_write_stream_socket.h',
         'socket/client_socket_factory.cc',
         'socket/client_socket_factory.h',
         'socket/client_socket_handle.cc',
         'socket/client_socket_handle.h',
@@ skipping 920 matching lines @@
         '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',
         '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_writer.cc',
-        'quic/test_tools/quic_test_writer.h',
         'quic/test_tools/reliable_quic_stream_peer.cc',
         'quic/test_tools/reliable_quic_stream_peer.h',
         'quic/test_tools/simple_quic_framer.cc',
         'quic/test_tools/simple_quic_framer.h',
         'quic/test_tools/test_task_runner.cc',
         'quic/test_tools/test_task_runner.h',
         'quic/quic_ack_notifier_test.cc',
         'quic/quic_alarm_test.cc',
         'quic/quic_bandwidth_test.cc',
         'quic/quic_client_session_test.cc',
@@ skipping 19 matching lines @@
         'quic/quic_reliable_client_stream_test.cc',
         'quic/quic_sent_entropy_manager_test.cc',
         'quic/quic_sent_packet_manager_test.cc',
         'quic/quic_session_test.cc',
         'quic/quic_spdy_compressor_test.cc',
         'quic/quic_spdy_decompressor_test.cc',
         'quic/quic_stream_factory_test.cc',
         'quic/quic_stream_sequencer_test.cc',
         'quic/quic_time_test.cc',
         'quic/quic_utils_test.cc',
+        'quic/quic_write_blocked_list_test.cc',
         'quic/reliable_quic_stream_test.cc',
         'server/http_server_response_info_unittest.cc',
         'server/http_server_unittest.cc',
         'socket/buffered_write_stream_socket_unittest.cc',
         'socket/client_socket_pool_base_unittest.cc',
         'socket/deterministic_socket_data_unittest.cc',
         'socket/mock_client_socket_pool_manager.cc',
         'socket/mock_client_socket_pool_manager.h',
         'socket/socks5_client_socket_unittest.cc',
         'socket/socks_client_socket_pool_unittest.cc',
@@ skipping 975 matching lines @@
             'tools/quic/quic_default_packet_writer.cc',
             'tools/quic/quic_default_packet_writer.h',
             'tools/quic/quic_dispatcher.h',
             'tools/quic/quic_dispatcher.cc',
             'tools/quic/quic_epoll_clock.cc',
             'tools/quic/quic_epoll_clock.h',
             'tools/quic/quic_epoll_connection_helper.cc',
             'tools/quic/quic_epoll_connection_helper.h',
             'tools/quic/quic_in_memory_cache.cc',
             'tools/quic/quic_in_memory_cache.h',
+            'tools/quic/quic_packet_writer_wrapper.cc',
+            'tools/quic/quic_packet_writer_wrapper.h',
             'tools/quic/quic_server.cc',
             'tools/quic/quic_server.h',
             'tools/quic/quic_server_session.cc',
             'tools/quic/quic_server_session.h',
             'tools/quic/quic_socket_utils.cc',
             'tools/quic/quic_socket_utils.h',
             'tools/quic/quic_spdy_client_stream.cc',
             'tools/quic/quic_spdy_client_stream.h',
             'tools/quic/quic_spdy_server_stream.cc',
             'tools/quic/quic_spdy_server_stream.h',
@@ skipping 197 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }