diff options
4 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index a614d29..d4a11da 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -201,7 +201,7 @@ void URLRequestAutomationJob::GetResponseInfo(net::HttpResponseInfo* info) { Time::Now() + TimeDelta::FromDays(kLifetimeDays)); info->ssl_info.cert_status = 0; - info->ssl_info.security_bits = 0; + info->ssl_info.security_bits = -1; } } diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc index 79d52ba..1cc446d 100644 --- a/chrome/browser/printing/print_dialog_cloud_uitest.cc +++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc @@ -69,7 +69,7 @@ class SimpleTestJob : public URLRequestTestJob { base::Time::Now() + base::TimeDelta::FromDays(kLifetimeDays)); info->ssl_info.cert_status = 0; - info->ssl_info.security_bits = 0; + info->ssl_info.security_bits = -1; } } diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc index 242b7c1..329eea6 100644 --- a/chrome/common/net/url_request_intercept_job.cc +++ b/chrome/common/net/url_request_intercept_job.cc @@ -160,7 +160,7 @@ void URLRequestInterceptJob::GetResponseInfo(net::HttpResponseInfo* info) { Time::Now() + TimeDelta::FromDays(kLifetimeDays)); info->ssl_info.cert_status = 0; - info->ssl_info.security_bits = 0; + info->ssl_info.security_bits = -1; } } diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 82d8288..3c5d05f 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -96,10 +96,14 @@ scoped_refptr<net::UploadData> CreateSimpleUploadData(const char* data) { // Verify that the SSLInfo of a successful SSL connection has valid values. void CheckSSLInfo(const net::SSLInfo& ssl_info) { - // Allow ChromeFrame fake certificates to get through. + // Allow ChromeFrame fake SSLInfo to get through. if (ssl_info.cert.get() && - ssl_info.cert.get()->issuer().GetDisplayName() == "Chrome Internal") + ssl_info.cert.get()->issuer().GetDisplayName() == "Chrome Internal") { + // -1 means unknown. + EXPECT_EQ(ssl_info.security_bits, -1); return; + } + // -1 means unknown. 0 means no encryption. EXPECT_GT(ssl_info.security_bits, 0); |