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

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: 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)
@@ -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
Ryan Sleevi 2012/11/28 21:56:13 Are these tests somehow disabled on iOS? I suspect
droger 2012/11/29 08:32:26 Some tests in this file are disabled on iOS becaus
wtc 2012/11/29 19:24:33 I don't know what you meant by "the OS_MACOSX rule
}
« net/url_request/url_fetcher_impl_unittest.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