commit 17f89c8bbe3ee4c73a6b3f55ce84961e0f981eeb
author davidben <davidben@chromium.org> Tue Jan 24 20:56:49 2017
committer Commit bot <commit-bot@chromium.org> Tue Jan 24 20:56:49 2017
tree 93533dcae73e73a58d6184d572ce7ee9bd181181
parent fdab33b3484cd6e1259015d0387a122cc62bf73f

Roll src/third_party/boringssl/src 1252f8758..358baeb9a

https://boringssl.googlesource.com/boringssl/+log/1252f8758ab1c4c4a14db25f9fa53e5950e4bcda..358baeb9a4df81ccb916a5b8cf0ed059087645bd

This sets up build rules for the new GTest-based test targets.

BUG=none

Review-Url: https://codereview.chromium.org/2651583005
Cr-Commit-Position: refs/heads/master@{#445803}

net/socket/ssl_server_socket_unittest.cc

diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index d99008c..79fab9e2 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -1081,8 +1081,8 @@
       0xc014,  // ECDHE_RSA_WITH_AES_256_CBC_SHA
       0xc02b,  // ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
       0xc02f,  // ECDHE_RSA_WITH_AES_128_GCM_SHA256
-      0xcc13,  // ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-      0xcc14,  // ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
+      0xcca8,  // ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+      0xcca9,  // ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
   };
   client_ssl_config_.disabled_cipher_suites.assign(
       kEcdheCiphers, kEcdheCiphers + arraysize(kEcdheCiphers));