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 692 matching lines @@
         'quic/crypto/aes_128_gcm_decrypter_nss.cc',
         'quic/crypto/aes_128_gcm_decrypter_openssl.cc',
         'quic/crypto/aes_128_gcm_encrypter.h',
         'quic/crypto/aes_128_gcm_encrypter_nss.cc',
         'quic/crypto/aes_128_gcm_encrypter_openssl.cc',
         'quic/crypto/crypto_framer.cc',
         'quic/crypto/crypto_framer.h',
         'quic/crypto/crypto_handshake.cc',
         '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/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',
         'quic/crypto/quic_decrypter.h',
         'quic/crypto/quic_encrypter.cc',
         'quic/crypto/quic_encrypter.h',
         'quic/crypto/quic_random.cc',
         'quic/crypto/quic_random.h',
         'quic/crypto/scoped_evp_cipher_ctx.h',
         'quic/crypto/strike_register.cc',
         'quic/crypto/strike_register.h',
+        'quic/crypto/source_address_token.cc',
+        'quic/crypto/source_address_token.h',
         'quic/quic_bandwidth.cc',
         'quic/quic_bandwidth.h',
         'quic/quic_blocked_writer_interface.h',
         'quic/quic_client_session.cc',
         'quic/quic_client_session.h',
         'quic/quic_config.cc',
         'quic/quic_config.h',
         'quic/quic_crypto_client_stream.cc',
         'quic/quic_crypto_client_stream.h',
         'quic/quic_crypto_client_stream_factory.h',
@@ skipping 1763 matching lines @@
             'tools/flip_server/streamer_interface.cc',
             'tools/flip_server/streamer_interface.h',
             'tools/flip_server/string_piece_utils.h',
           ],
         },
         {
           'target_name': 'quic_library',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
+            '../crypto/crypto.gyp:crypto',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../build/temp_gyp/googleurl.gyp:googleurl',
             '../third_party/openssl/openssl.gyp:openssl',
             'flip_balsa_and_epoll_library',
             'net',
           ],
           'sources': [
             'tools/quic/quic_client.cc',
             'tools/quic/quic_client.h',
             'tools/quic/quic_client_session.cc',
@@ skipping 51 matching lines @@
           ],
           'sources': [
             'tools/quic/quic_server_bin.cc',
           ],
         },
         {
           'target_name': 'quic_unittests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             '../base/base.gyp:test_support_base',
+            '../crypto/crypto.gyp:crypto',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             'net',
             'quic_library',
           ],
           'sources': [
             'quic/test_tools/quic_session_peer.cc',
             'quic/test_tools/quic_session_peer.h',
             'quic/test_tools/crypto_test_utils.cc',
             'quic/test_tools/crypto_test_utils.h',
@@ skipping 211 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }