Index: net/url_request/url_request_unittest.cc |
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc |
index 43d5d308f5c5a813e6d509ceabc4ac0e1bb7e935..16133528fa3c17e590a69dced1bc0eab46f3e382 100644 |
--- a/net/url_request/url_request_unittest.cc |
+++ b/net/url_request/url_request_unittest.cc |
@@ -7015,12 +7015,12 @@ static bool SystemSupportsHardFailRevocationChecking() { |
// several tests are effected because our testing EV certificate won't be |
// recognised as EV. |
static bool SystemUsesChromiumEVMetadata() { |
-#if defined(USE_OPENSSL) |
+#if defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID) |
// http://crbug.com/117478 - OpenSSL does not support EV validation. |
return false; |
-#elif defined(OS_MACOSX) && !defined(OS_IOS) |
- // On OS X, we use the system to tell us whether a certificate is EV or not |
- // and the system won't recognise our testing root. |
+#elif (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_ANDROID) |
+ // On OS X and Android, we use the system to tell us whether a certificate is |
+ // EV or not and the system won't recognise our testing root. |
return false; |
#else |
return true; |