| Index: content/common/ssl_status_serialization_unittest.cc
|
| diff --git a/content/common/ssl_status_serialization_unittest.cc b/content/common/ssl_status_serialization_unittest.cc
|
| index 9c49b42e9579b132657e073ada6f52792574c92a..3c7319cd1dbb01ee938624c4667efc6afe20da16 100644
|
| --- a/content/common/ssl_status_serialization_unittest.cc
|
| +++ b/content/common/ssl_status_serialization_unittest.cc
|
| @@ -16,7 +16,7 @@ void SetTestStatus(SSLStatus* status) {
|
| status->cert_id = 1;
|
| status->cert_status = net::CERT_STATUS_DATE_INVALID;
|
| status->security_bits = 80;
|
| - status->key_exchange_info = 23;
|
| + status->key_exchange_group = 23;
|
| status->connection_status = net::SSL_CONNECTION_VERSION_TLS1_2;
|
| status->sct_statuses.push_back(net::ct::SCT_STATUS_OK);
|
| }
|
| @@ -28,13 +28,13 @@ bool SSLStatusAreEqual(const SSLStatus& a, const SSLStatus &b) {
|
| } // namespace
|
|
|
| std::ostream& operator<<(std::ostream& os, const SSLStatus& status) {
|
| - return os << "Security Style: " << status.security_style
|
| + return os << "Security style: " << status.security_style
|
| << "\nCert ID: " << status.cert_id
|
| - << "\nCert Status: " << status.cert_status
|
| + << "\nCert status: " << status.cert_status
|
| << "\nSecurity bits: " << status.security_bits
|
| - << "\nKey exchange info: " << status.key_exchange_info
|
| + << "\nKey exchange group: " << status.key_exchange_group
|
| << "\nConnection status: " << status.connection_status
|
| - << "\nContent Status: " << status.content_status
|
| + << "\nContent status: " << status.content_status
|
| << "\nNumber of SCTs: " << status.sct_statuses.size();
|
| }
|
|
|
| @@ -79,19 +79,6 @@ TEST(SSLStatusSerializationTest, DeserializeBogusSecurityBits) {
|
| EXPECT_PRED2(SSLStatusAreEqual, SSLStatus(), invalid_deserialized);
|
| }
|
|
|
| -// Serialize a status with a bad |key_exchange_info| value and test that
|
| -// deserializing it fails.
|
| -TEST(SSLStatusSerializationTest, DeserializeBogusKeyExchangeInfo) {
|
| - SSLStatus status;
|
| - SetTestStatus(&status);
|
| - status.key_exchange_info = -1;
|
| -
|
| - SSLStatus invalid_deserialized;
|
| - std::string serialized = SerializeSecurityInfo(status);
|
| - ASSERT_FALSE(DeserializeSecurityInfo(serialized, &invalid_deserialized));
|
| - EXPECT_PRED2(SSLStatusAreEqual, SSLStatus(), invalid_deserialized);
|
| -}
|
| -
|
| // Serialize a status with a bad |security_style| value and test that
|
| // deserializing it fails.
|
| TEST(SSLStatusSerializationTest, DeserializeBogusSecurityStyle) {
|
|
|