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_simple_cache_backend%': 0,
@@ skipping 682 matching lines @@
         'quic/congestion_control/send_algorithm_interface.cc',
         'quic/congestion_control/send_algorithm_interface.h',
         'quic/congestion_control/tcp_cubic_sender.cc',
         'quic/congestion_control/tcp_cubic_sender.h',
         'quic/congestion_control/tcp_receiver.cc',
         'quic/congestion_control/tcp_receiver.h',
         'quic/crypto/crypto_framer.cc',
         'quic/crypto/crypto_framer.h',
         'quic/crypto/crypto_handshake.cc',
         'quic/crypto/crypto_handshake.h',
-        'quic/crypto/crypto_protocol.cc',
         'quic/crypto/crypto_protocol.h',
         'quic/crypto/crypto_utils.cc',
         'quic/crypto/crypto_utils.h',
         'quic/crypto/curve25519_key_exchange.cc',
         'quic/crypto/curve25519_key_exchange.h',
         'quic/crypto/key_exchange.h',
         'quic/crypto/null_decrypter.cc',
         'quic/crypto/null_decrypter.h',
         'quic/crypto/null_encrypter.cc',
         'quic/crypto/null_encrypter.h',
@@ skipping 40 matching lines @@
         'quic/quic_packet_entropy_manager.cc',
         'quic/quic_packet_entropy_manager.h',
         'quic/quic_packet_generator.cc',
         'quic/quic_packet_generator.h',
         'quic/quic_protocol.cc',
         'quic/quic_protocol.h',
         'quic/quic_reliable_client_stream.cc',
         'quic/quic_reliable_client_stream.h',
         'quic/quic_session.cc',
         'quic/quic_session.h',
+        'quic/quic_stats.cc',
+        'quic/quic_stats.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/reliable_quic_stream.cc',
         'quic/reliable_quic_stream.h',
@@ skipping 771 matching lines @@
         'quic/crypto/p256_key_exchange_test.cc',
         'quic/crypto/quic_random_test.cc',
         '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_random.cc',
         'quic/test_tools/mock_random.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',
@@ skipping 1016 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }