Land Recent QUIC Changes

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index cdfcdde91fcde93e978a9d0d6227777473ca5ba4..c319a682a793bdb884d720e563a918774fd60ce8 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -710,6 +710,10 @@
         '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',
@@ -722,6 +726,7 @@
         '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',
@@ -731,6 +736,8 @@
         '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',
@@ -2514,6 +2521,7 @@
           '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',
@@ -2585,6 +2593,7 @@
           'type': '<(gtest_target_type)',
           'dependencies': [
             '../base/base.gyp:test_support_base',
+            '../crypto/crypto.gyp:crypto',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             'net',