summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-15 20:31:37 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-15 20:31:37 +0000
commit89af3d922fca3d76c2bed4b178f9ccc0a4741392 (patch)
tree11fdd4128125611663080e4a27b10236cbfa4c29 /net
parent3cc4d00cae48dad31ac6bb2ed634c8ad5e098b37 (diff)
downloadchromium_src-89af3d922fca3d76c2bed4b178f9ccc0a4741392.zip
chromium_src-89af3d922fca3d76c2bed4b178f9ccc0a4741392.tar.gz
chromium_src-89af3d922fca3d76c2bed4b178f9ccc0a4741392.tar.bz2
In a fake SSLInfo, set security_bits to -1 instead of 0
because the encryption strength is unknown (0 means no encryption). R=finnur BUG=53366,13049 TEST=no unit test failures Review URL: http://codereview.chromium.org/3749003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/url_request/url_request_unittest.cc8
1 files changed, 6 insertions, 2 deletions
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);