| Index: net/url_request/url_request_unittest.cc
|
| ===================================================================
|
| --- net/url_request/url_request_unittest.cc (revision 170598)
|
| +++ net/url_request/url_request_unittest.cc (working copy)
|
| @@ -457,7 +457,7 @@
|
|
|
| } // namespace
|
|
|
| -// Inherit PlatformTest since we require the autorelease pool on Mac OS X.f
|
| +// Inherit PlatformTest since we require the autorelease pool on Mac OS X.
|
| class URLRequestTest : public PlatformTest {
|
| public:
|
| URLRequestTest() : default_context_(true) {
|
| @@ -4515,7 +4515,7 @@
|
| CHECK_NE(static_cast<X509Certificate*>(NULL), root_cert);
|
| test_root_.reset(new ScopedTestRoot(root_cert));
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS) || defined(OS_IOS)
|
| SetURLRequestContextForNSSHttpIO(&context_);
|
| EnsureNSSHttpIOInit();
|
| #endif
|
| @@ -4540,7 +4540,7 @@
|
| }
|
|
|
| ~HTTPSOCSPTest() {
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS) || defined(OS_IOS)
|
| ShutdownNSSHttpIO();
|
| #endif
|
| }
|
| @@ -4578,7 +4578,7 @@
|
| #if defined(USE_OPENSSL)
|
| // http://crbug.com/117478 - OpenSSL does not support EV validation.
|
| return false;
|
| -#elif defined(OS_MACOSX)
|
| +#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.
|
| return false;
|
| @@ -4634,7 +4634,7 @@
|
| CertStatus cert_status;
|
| DoConnection(ssl_options, &cert_status);
|
|
|
| -#if !defined(OS_MACOSX)
|
| +#if !(defined(OS_MACOSX) && !defined(OS_IOS))
|
| // Doesn't pass on OS X yet for reasons that need to be investigated.
|
| EXPECT_EQ(CERT_STATUS_REVOKED, cert_status & CERT_STATUS_ALL_ERRORS);
|
| #endif
|
|
|