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 1641 matching lines @@
         'quic/test_tools/crypto_test_utils.cc',
         'quic/test_tools/crypto_test_utils.h',
         'quic/test_tools/mock_clock.cc',
         'quic/test_tools/mock_clock.h',
         'quic/test_tools/mock_crypto_client_stream.cc',
         'quic/test_tools/mock_crypto_client_stream.h',
         '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_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_session_peer.cc',
         'quic/test_tools/quic_session_peer.h',
         'quic/test_tools/quic_test_utils.cc',
         'quic/test_tools/quic_test_utils.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_bandwidth_test.cc',
         'quic/quic_client_session_test.cc',
         '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_writer_test.cc',
         'quic/quic_fec_group_test.cc',
         'quic/quic_framer_test.cc',
         'quic/quic_http_stream_test.cc',
         'quic/quic_network_transaction_unittest.cc',
@@ skipping 988 matching lines @@
             'tools/quic/quic_dispatcher_test.cc',
             'tools/quic/quic_epoll_clock_test.cc',
             'tools/quic/quic_epoll_connection_helper_test.cc',
             'tools/quic/quic_reliable_client_stream_test.cc',
             'tools/quic/quic_reliable_server_stream_test.cc',
             'tools/quic/quic_spdy_server_stream_test.cc',
             'tools/quic/test_tools/http_message_test_utils.cc',
             'tools/quic/test_tools/http_message_test_utils.h',
             'tools/quic/test_tools/mock_epoll_server.cc',
             'tools/quic/test_tools/mock_epoll_server.h',
+            'tools/quic/test_tools/quic_client_peer.cc',
+            'tools/quic/test_tools/quic_client_peer.h',
+            'tools/quic/test_tools/quic_epoll_connection_helper_peer.cc',
+            'tools/quic/test_tools/quic_epoll_connection_helper_peer.h',
             'tools/quic/test_tools/quic_test_client.cc',
             '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/run_all_unittests.cc',
           ],
         }
       ]
     }],
     ['OS=="android"', {
@@ skipping 172 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }