Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(799)

Unified Diff: net/url_request/url_request_unittest.cc

Issue 11434009: Ensure that NSS HTTP IO is initialized on iOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Add chrome/browser/io_thread.cc to the CL. Update OS_MACOSX related tests. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/url_request/url_request_unittest.cc
===================================================================
--- net/url_request/url_request_unittest.cc (revision 168842)
+++ 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) {
@@ -4463,7 +4463,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
@@ -4488,7 +4488,7 @@
}
~HTTPSOCSPTest() {
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
ShutdownNSSHttpIO();
#endif
}
@@ -4526,7 +4526,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;
@@ -4582,7 +4582,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
« chrome/browser/io_thread.cc ('K') | « net/url_request/url_fetcher_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698