Merge from Chromium at DEPS revision r216370
This commit was generated by merge_to_master.py.
Change-Id: I739228187a6f1df6c28c5761160e593a49891113
diff --git a/net/net.gyp b/net/net.gyp
index 8942367..0165031 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -271,6 +271,9 @@
'cert/crl_set.h',
'cert/ev_root_ca_metadata.cc',
'cert/ev_root_ca_metadata.h',
+ 'cert/jwk_serializer_nss.cc',
+ 'cert/jwk_serializer_openssl.cc',
+ 'cert/jwk_serializer.h',
'cert/multi_threaded_cert_verifier.cc',
'cert/multi_threaded_cert_verifier.h',
'cert/nss_cert_database.cc',
@@ -390,6 +393,8 @@
'disk_cache/simple/simple_entry_format.h',
'disk_cache/simple/simple_entry_impl.cc',
'disk_cache/simple/simple_entry_impl.h',
+ 'disk_cache/simple/simple_entry_operation.cc',
+ 'disk_cache/simple/simple_entry_operation.h',
'disk_cache/simple/simple_index.cc',
'disk_cache/simple/simple_index.h',
'disk_cache/simple/simple_index_file.cc',
@@ -1199,6 +1204,7 @@
'cert/cert_database_nss.cc',
'cert/cert_verify_proc_nss.cc',
'cert/cert_verify_proc_nss.h',
+ 'cert/jwk_serializer_nss.cc',
'cert/nss_cert_database.cc',
'cert/nss_cert_database.h',
'cert/test_root_certs_nss.cc',
@@ -1236,6 +1242,7 @@
'cert/cert_database_openssl.cc',
'cert/cert_verify_proc_openssl.cc',
'cert/cert_verify_proc_openssl.h',
+ 'cert/jwk_serializer_openssl.cc',
'cert/test_root_certs_openssl.cc',
'cert/x509_certificate_openssl.cc',
'cert/x509_util_openssl.cc',
@@ -1524,6 +1531,7 @@
'cert/cert_verify_proc_unittest.cc',
'cert/crl_set_unittest.cc',
'cert/ev_root_ca_metadata_unittest.cc',
+ 'cert/jwk_serializer_unittest.cc',
'cert/multi_threaded_cert_verifier_unittest.cc',
'cert/nss_cert_database_unittest.cc',
'cert/pem_tokenizer_unittest.cc',
@@ -1869,11 +1877,14 @@
'tools/quic/quic_in_memory_cache_test.cc',
'tools/quic/quic_reliable_client_stream_test.cc',
'tools/quic/quic_reliable_server_stream_test.cc',
+ 'tools/quic/quic_server_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/mock_quic_dispatcher.cc',
+ 'tools/quic/test_tools/mock_quic_dispatcher.h',
'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',