Chromium Code Reviews| 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 f56439cafe500afc39299e675c44d4af3f41d1c2..5f47afc5be203a5e12016678639d102359e7ed4b 100644 |
| --- a/net/url_request/url_request_unittest.cc |
| +++ b/net/url_request/url_request_unittest.cc |
| @@ -6943,12 +6943,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. |
|
wtc
2014/03/25 17:18:28
Nit: the first couple of words can be moved to the
haavardm
2014/03/26 12:25:18
Done.
|
| return false; |
| #else |
| return true; |