Chromium Code Reviews| Index: net/socket/ssl_client_socket.cc |
| diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc |
| index 3472fd023f2aae650c253a8212de8c533dbc5c55..cf8f40aa5931ae30f2ae3401e1007e4b1a988508 100644 |
| --- a/net/socket/ssl_client_socket.cc |
| +++ b/net/socket/ssl_client_socket.cc |
| @@ -127,14 +127,13 @@ void SSLClientSocket::RecordNegotiationExtension() { |
| void SSLClientSocket::RecordChannelIDSupport( |
| ChannelIDService* channel_id_service, |
| bool negotiated_channel_id, |
| - bool channel_id_enabled, |
| - bool supports_ecc) { |
| + bool channel_id_enabled) { |
| // Since this enum is used for a histogram, do not change or re-use values. |
| enum { |
| DISABLED = 0, |
| CLIENT_ONLY = 1, |
| CLIENT_AND_SERVER = 2, |
| - CLIENT_NO_ECC = 3, |
| + // CLIENT_NO_ECC is unused now. |
|
Ryan Sleevi
2015/10/15 22:00:15
This doesn't match how CLIENT_BAD_SYSTEM_TIME was
|
| // CLIENT_BAD_SYSTEM_TIME is unused now. |
| CLIENT_BAD_SYSTEM_TIME = 4, |
| CLIENT_NO_CHANNEL_ID_SERVICE = 5, |
| @@ -145,8 +144,6 @@ void SSLClientSocket::RecordChannelIDSupport( |
| } else if (channel_id_enabled) { |
| if (!channel_id_service) |
| supported = CLIENT_NO_CHANNEL_ID_SERVICE; |
| - else if (!supports_ecc) |
| - supported = CLIENT_NO_ECC; |
| else |
| supported = CLIENT_ONLY; |
| } |
| @@ -164,10 +161,6 @@ bool SSLClientSocket::IsChannelIDEnabled( |
| DVLOG(1) << "NULL channel_id_service_, not enabling channel ID."; |
| return false; |
| } |
| - if (!crypto::ECPrivateKey::IsSupported()) { |
| - DVLOG(1) << "Elliptic Curve not supported, not enabling channel ID."; |
| - return false; |
| - } |
| return true; |
| } |