Commit f3c8e19f authored by Eugene But's avatar Eugene But Committed by Commit Bot

Removed SSLStatus::connection_status as unused.

Bug: 656123
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I0951d27cf4095d103bbf5a6aa154bdf8493066c2
Reviewed-on: https://chromium-review.googlesource.com/823290Reviewed-by: default avatarDavid Benjamin <davidben@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523841}
parent 1e363e1d
...@@ -179,7 +179,6 @@ class CredentialManagerBaseTest ...@@ -179,7 +179,6 @@ class CredentialManagerBaseTest
ssl.security_style = security_style; ssl.security_style = security_style;
ssl.certificate = cert; ssl.certificate = cert;
ssl.cert_status = cert_status; ssl.cert_status = cert_status;
ssl.connection_status = net::SSL_CONNECTION_VERSION_SSL3;
ssl.content_status = content_status; ssl.content_status = content_status;
ssl.cert_status_host = kHostName; ssl.cert_status_host = kHostName;
} }
......
...@@ -52,7 +52,6 @@ IOSSecurityStateTabHelper::GetVisibleSecurityState() const { ...@@ -52,7 +52,6 @@ IOSSecurityStateTabHelper::GetVisibleSecurityState() const {
const web::SSLStatus& ssl = item->GetSSL(); const web::SSLStatus& ssl = item->GetSSL();
state->certificate = ssl.certificate; state->certificate = ssl.certificate;
state->cert_status = ssl.cert_status; state->cert_status = ssl.cert_status;
state->connection_status = ssl.connection_status;
state->displayed_mixed_content = state->displayed_mixed_content =
(ssl.content_status & web::SSLStatus::DISPLAYED_INSECURE_CONTENT) ? true (ssl.content_status & web::SSLStatus::DISPLAYED_INSECURE_CONTENT) ? true
: false; : false;
......
...@@ -9,7 +9,6 @@ namespace web { ...@@ -9,7 +9,6 @@ namespace web {
SSLStatus::SSLStatus() SSLStatus::SSLStatus()
: security_style(SECURITY_STYLE_UNKNOWN), : security_style(SECURITY_STYLE_UNKNOWN),
cert_status(0), cert_status(0),
connection_status(0),
content_status(NORMAL_CONTENT) { content_status(NORMAL_CONTENT) {
} }
...@@ -17,7 +16,6 @@ SSLStatus::SSLStatus(const SSLStatus& other) ...@@ -17,7 +16,6 @@ SSLStatus::SSLStatus(const SSLStatus& other)
: security_style(other.security_style), : security_style(other.security_style),
certificate(other.certificate), certificate(other.certificate),
cert_status(other.cert_status), cert_status(other.cert_status),
connection_status(other.connection_status),
content_status(other.content_status), content_status(other.content_status),
cert_status_host(other.cert_status_host), cert_status_host(other.cert_status_host),
user_data(other.user_data ? other.user_data->Clone() : nullptr) {} user_data(other.user_data ? other.user_data->Clone() : nullptr) {}
...@@ -26,7 +24,6 @@ SSLStatus& SSLStatus::operator=(SSLStatus other) { ...@@ -26,7 +24,6 @@ SSLStatus& SSLStatus::operator=(SSLStatus other) {
security_style = other.security_style; security_style = other.security_style;
certificate = other.certificate; certificate = other.certificate;
cert_status = other.cert_status; cert_status = other.cert_status;
connection_status = other.connection_status;
content_status = other.content_status; content_status = other.content_status;
cert_status_host = other.cert_status_host; cert_status_host = other.cert_status_host;
user_data = other.user_data ? other.user_data->Clone() : nullptr; user_data = other.user_data ? other.user_data->Clone() : nullptr;
......
...@@ -61,7 +61,6 @@ struct SSLStatus { ...@@ -61,7 +61,6 @@ struct SSLStatus {
web::SecurityStyle security_style; web::SecurityStyle security_style;
scoped_refptr<net::X509Certificate> certificate; scoped_refptr<net::X509Certificate> certificate;
net::CertStatus cert_status; net::CertStatus cert_status;
int connection_status;
// A combination of the ContentStatusFlags above. // A combination of the ContentStatusFlags above.
int content_status; int content_status;
// Host which was used for |cert_status| calculation. It is not an actual part // Host which was used for |cert_status| calculation. It is not an actual part
......
...@@ -36,7 +36,6 @@ TEST_F(SSLStatusTest, SSLStatusEqualityTest) { ...@@ -36,7 +36,6 @@ TEST_F(SSLStatusTest, SSLStatusEqualityTest) {
SSLStatus status; SSLStatus status;
EXPECT_EQ(SECURITY_STYLE_UNKNOWN, status.security_style); EXPECT_EQ(SECURITY_STYLE_UNKNOWN, status.security_style);
EXPECT_EQ(0u, status.cert_status); EXPECT_EQ(0u, status.cert_status);
EXPECT_EQ(0, status.connection_status);
EXPECT_EQ(SSLStatus::NORMAL_CONTENT, status.content_status); EXPECT_EQ(SSLStatus::NORMAL_CONTENT, status.content_status);
// Verify that the Equals() method returns false if two SSLStatus objects // Verify that the Equals() method returns false if two SSLStatus objects
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment