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 711 matching lines @@
         'quic/crypto/crypto_handshake.h',
         'quic/crypto/crypto_protocol.h',
         'quic/crypto/crypto_server_config.cc',
         'quic/crypto/crypto_server_config.h',
         'quic/crypto/crypto_server_config_protobuf.cc',
         'quic/crypto/crypto_server_config_protobuf.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/ephemeral_key_source.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',
         'quic/crypto/p256_key_exchange.h',
         'quic/crypto/p256_key_exchange_nss.cc',
         'quic/crypto/p256_key_exchange_openssl.cc',
         'quic/crypto/proof_source.h',
         'quic/crypto/quic_decrypter.cc',
@@ skipping 1930 matching lines @@
             'quic/test_tools/reliable_quic_stream_peer.h',
             'tools/flip_server/simple_buffer.cc',
             'tools/flip_server/simple_buffer.h',
             'tools/quic/end_to_end_test.cc',
             'tools/quic/quic_client_session_test.cc',
             '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_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',
           ],
@@ skipping 176 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }