Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
diff --git a/net/net.target.darwin-mips.mk b/net/net.target.darwin-mips.mk
index 1e30736..1377252d 100644
--- a/net/net.target.darwin-mips.mk
+++ b/net/net.target.darwin-mips.mk
@@ -103,10 +103,12 @@
net/cert/cert_verify_proc_android.cc \
net/cert/cert_verify_result.cc \
net/cert/crl_set.cc \
+ net/cert/ct_serialization.cc \
net/cert/ev_root_ca_metadata.cc \
net/cert/jwk_serializer_openssl.cc \
net/cert/multi_threaded_cert_verifier.cc \
net/cert/pem_tokenizer.cc \
+ net/cert/signed_certificate_timestamp.cc \
net/cert/single_request_cert_verifier.cc \
net/cert/test_root_certs.cc \
net/cert/test_root_certs_android.cc \
@@ -299,7 +301,6 @@
net/quic/crypto/crypto_framer.cc \
net/quic/crypto/crypto_handshake.cc \
net/quic/crypto/crypto_secret_boxer.cc \
- net/quic/crypto/crypto_server_config.cc \
net/quic/crypto/crypto_server_config_protobuf.cc \
net/quic/crypto/crypto_utils.cc \
net/quic/crypto/curve25519_key_exchange.cc \
@@ -309,6 +310,8 @@
net/quic/crypto/proof_source_chromium.cc \
net/quic/crypto/proof_verifier.cc \
net/quic/crypto/proof_verifier_chromium.cc \
+ net/quic/crypto/quic_crypto_client_config.cc \
+ net/quic/crypto/quic_crypto_server_config.cc \
net/quic/crypto/quic_decrypter.cc \
net/quic/crypto/quic_encrypter.cc \
net/quic/crypto/quic_random.cc \