summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorjnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-24 19:06:44 +0000
committerjnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-24 19:06:44 +0000
commit57c62f02e1b2ffbd6fee285998297a39e5f4c790 (patch)
treeae08583406d7d684957c47cd40675de53b9644a6 /net/url_request
parentd946e94698cddcea91ab9fc16177dc131a7dd9ae (diff)
downloadchromium_src-57c62f02e1b2ffbd6fee285998297a39e5f4c790.zip
chromium_src-57c62f02e1b2ffbd6fee285998297a39e5f4c790.tar.gz
chromium_src-57c62f02e1b2ffbd6fee285998297a39e5f4c790.tar.bz2
Revert 128414 - Disable OCSP tests on Android
The OCSP test server works now. (fixed by http://src.chromium.org/viewvc/chrome?view=rev&revision=133704) The on-demand OCSP test server is not supported on Android. Disable these tests. BUG=119642 TEST=green bots Review URL: http://codereview.chromium.org/9837027 TBR=rsleevi@chromium.org Review URL: http://codereview.chromium.org/10211002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_unittest.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 12c90b7..d825711 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1411,10 +1411,6 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) {
}
}
-// Disabled on Android - http://crbug.com/119642 - The Android test server
-// does not support generating OCSP responses on the fly.
-#if !defined(OS_ANDROID)
-
class TestSSLConfigService : public SSLConfigService {
public:
TestSSLConfigService(bool ev_enabled, bool online_rev_checking)
@@ -1730,8 +1726,6 @@ TEST_F(HTTPSCRLSetTest, ExpiredCRLSet) {
EXPECT_FALSE(cert_status & CERT_STATUS_REV_CHECKING_ENABLED);
}
-#endif // !defined(OS_ANDROID)
-
// This tests that a load of www.google.com with a certificate error sets
// the |certificate_errors_are_fatal| flag correctly. This flag will cause
// the interstitial to be fatal.