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 698 matching lines @@
         'quic/congestion_control/tcp_receiver.cc',
         'quic/congestion_control/tcp_receiver.h',
         'quic/crypto/aes_128_gcm_12_decrypter.h',
         'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
         'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
         'quic/crypto/aes_128_gcm_12_encrypter.h',
         'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
         'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
         'quic/crypto/cert_compressor.cc',
         'quic/crypto/cert_compressor.h',
+        'quic/crypto/channel_id.cc',
+        'quic/crypto/channel_id.h',
+        'quic/crypto/channel_id_nss.cc',
+        'quic/crypto/channel_id_openssl.cc',
         'quic/crypto/common_cert_set.cc',
         'quic/crypto/common_cert_set.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.h',
         'quic/crypto/crypto_secret_boxer.cc',
         'quic/crypto/crypto_secret_boxer.h',
         'quic/crypto/crypto_server_config.cc',
@@ skipping 444 matching lines @@
               'cert/nss_cert_database.cc',
               'cert/nss_cert_database.h',
               'cert/test_root_certs_nss.cc',
               'cert/x509_certificate_nss.cc',
               'cert/x509_util_nss.cc',
               'cert/x509_util_nss.h',
               'ocsp/nss_ocsp.cc',
               'ocsp/nss_ocsp.h',
               'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
               'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
+              'quic/crypto/channel_id_nss.cc',
               'quic/crypto/p256_key_exchange_nss.cc',
               'socket/nss_ssl_util.cc',
               'socket/nss_ssl_util.h',
               'socket/ssl_client_socket_nss.cc',
               'socket/ssl_client_socket_nss.h',
               'socket/ssl_server_socket_nss.cc',
               'socket/ssl_server_socket_nss.h',
               'ssl/client_cert_store_impl_nss.cc',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
@@ skipping 12 matching lines @@
               'base/openssl_private_key_store_memory.cc',
               'cert/cert_database_openssl.cc',
               'cert/cert_verify_proc_openssl.cc',
               'cert/cert_verify_proc_openssl.h',
               'cert/test_root_certs_openssl.cc',
               'cert/x509_certificate_openssl.cc',
               'cert/x509_util_openssl.cc',
               'cert/x509_util_openssl.h',
               'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
               'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
+              'quic/crypto/channel_id_openssl.cc',
               'quic/crypto/p256_key_exchange_openssl.cc',
               'quic/crypto/scoped_evp_cipher_ctx.cc',
               'quic/crypto/scoped_evp_cipher_ctx.h',
               'socket/ssl_client_socket_openssl.cc',
               'socket/ssl_client_socket_openssl.h',
               'socket/ssl_server_socket_openssl.cc',
               'ssl/openssl_client_key_store.cc',
               'ssl/openssl_client_key_store.h',
             ],
           },
@@ skipping 419 matching lines @@
         'quic/congestion_control/leaky_bucket_test.cc',
         'quic/congestion_control/paced_sender_test.cc',
         'quic/congestion_control/quic_congestion_control_test.cc',
         'quic/congestion_control/quic_congestion_manager_test.cc',
         'quic/congestion_control/quic_max_sized_map_test.cc',
         'quic/congestion_control/tcp_cubic_sender_test.cc',
         'quic/congestion_control/tcp_receiver_test.cc',
         'quic/crypto/aes_128_gcm_12_decrypter_test.cc',
         'quic/crypto/aes_128_gcm_12_encrypter_test.cc',
         'quic/crypto/cert_compressor_test.cc',
+        'quic/crypto/channel_id_test.cc',
         'quic/crypto/common_cert_set_test.cc',
         'quic/crypto/crypto_framer_test.cc',
         'quic/crypto/crypto_handshake_test.cc',
         'quic/crypto/crypto_secret_boxer_test.cc',
         'quic/crypto/crypto_server_test.cc',
         'quic/crypto/crypto_utils_test.cc',
         'quic/crypto/curve25519_key_exchange_test.cc',
         'quic/crypto/null_decrypter_test.cc',
         'quic/crypto/null_encrypter_test.cc',
         'quic/crypto/p256_key_exchange_test.cc',
         'quic/crypto/proof_test.cc',
         'quic/crypto/quic_random_test.cc',
         'quic/crypto/strike_register_test.cc',
         'quic/test_tools/crypto_test_utils.cc',
         'quic/test_tools/crypto_test_utils.h',
+        'quic/test_tools/crypto_test_utils_nss.cc',
+        'quic/test_tools/crypto_test_utils_openssl.cc',
         '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',
@@ skipping 210 matching lines @@
             'ocsp/nss_ocsp_unittest.cc',
           ],
         }],
         [ 'use_openssl==1', {
             # When building for OpenSSL, we need to exclude NSS specific tests.
             # TODO(bulach): Add equivalent tests when the underlying
             #               functionality is ported to OpenSSL.
             'sources!': [
               'cert/nss_cert_database_unittest.cc',
               'cert/x509_util_nss_unittest.cc',
+              'quic/test_tools/crypto_test_utils_nss.cc',
               'ssl/client_cert_store_impl_unittest.cc',
             ],
           }, {  # else !use_openssl: remove the unneeded files
             'sources!': [
               'cert/x509_util_openssl_unittest.cc',
+              'quic/test_tools/crypto_test_utils_openssl.cc',
               'socket/ssl_client_socket_openssl_unittest.cc',
               'ssl/openssl_client_key_store_unittest.cc',
             ],
           },
         ],
         [ 'enable_websockets != 1', {
             'sources/': [
               ['exclude', '^socket_stream/'],
               ['exclude', '^websockets/'],
               ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'],
@@ skipping 761 matching lines @@
             '../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',
+            'quic/test_tools/crypto_test_utils_nss.cc',
+            'quic/test_tools/crypto_test_utils_openssl.cc',
             '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/simple_quic_framer.cc',
             'quic/test_tools/simple_quic_framer.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',
@@ skipping 20 matching lines @@
             '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',
           ],
+          'conditions': [
+            [ 'use_openssl==1', {
+                # When building for OpenSSL, we need to exclude NSS specific tests.
+                'sources!': [
+                  'quic/test_tools/crypto_test_utils_nss.cc',
+                ],
+              }, {  # else !use_openssl: remove the unneeded files
+                'sources!': [
+                  'quic/test_tools/crypto_test_utils_openssl.cc',
+                ],
+              },
+            ],
+          ],
         }
       ]
     }],
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'net_jni_headers',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/net/AndroidKeyStore.java',
@@ skipping 166 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }