summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_unittest.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-29 15:20:05 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-29 15:20:05 +0000
commitc679be260c4a87f9daad3ab3110bf44395732f8b (patch)
treed998dcc16af6ab9962b535be651caf0b3603e857 /net/url_request/url_request_unittest.cc
parent0b0609e9fb67d7897cd1ffc32077704576dd3c54 (diff)
downloadchromium_src-c679be260c4a87f9daad3ab3110bf44395732f8b.zip
chromium_src-c679be260c4a87f9daad3ab3110bf44395732f8b.tar.gz
chromium_src-c679be260c4a87f9daad3ab3110bf44395732f8b.tar.bz2
Fix ChromeFrame HTTPs net tests which started failing with the change to validate the
certificate info in the HTTPs tests. ChromeFrame's host network stack implementation returns a fake certificate as we don't have access to the real certificate info from IE. Fix is to bypass this check for ChromeFrame. TBR=wtc Review URL: http://codereview.chromium.org/3229008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_unittest.cc')
-rw-r--r--net/url_request/url_request_unittest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 0de5929..5a9b0ae 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -95,6 +95,10 @@ 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.
+ if (ssl_info.cert.get() &&
+ ssl_info.cert.get()->issuer().GetDisplayName() == "Chrome Internal")
+ return;
// -1 means unknown. 0 means no encryption.
EXPECT_GT(ssl_info.security_bits, 0);