Ensure that NSS HTTP IO is initialized on iOS.

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
===================================================================
--- chrome/browser/io_thread.cc	(revision 168842)
+++ chrome/browser/io_thread.cc	(working copy)
@@ -60,9 +60,9 @@
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
 #include "net/ocsp/nss_ocsp.h"
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)

[wtc, 2012/11/29 19:24:33]

Please let me know if you prefer that I simply remove these
#endif comments. I think they clutter the code when the
conditionally-compiled section of code is very short.

[Ryan Sleevi, 2012/11/29 20:35:13]

Agreed

 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
@@ -88,16 +88,16 @@
 class SystemURLRequestContext : public net::URLRequestContext {
  public:
   SystemURLRequestContext() {
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
     net::SetURLRequestContextForNSSHttpIO(this);
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)
   }
 
  private:
   virtual ~SystemURLRequestContext() {
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
     net::SetURLRequestContextForNSSHttpIO(NULL);
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)
   }
 };
 
@@ -412,9 +412,9 @@
 void IOThread::Init() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
   net::SetMessageLoopForNSSHttpIO();
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
@@ -575,9 +575,9 @@
   delete sdch_manager_;
   sdch_manager_ = NULL;
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
   net::ShutdownNSSHttpIO();
-#endif  // defined(USE_NSS)
+#endif  // defined(USE_NSS) || defined(OS_IOS)
 
   system_url_request_context_getter_ = NULL;