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 170598)
+++ chrome/browser/io_thread.cc	(working copy)
@@ -67,9 +67,9 @@
 #include "policy/policy_constants.h"
 #endif
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)

[Nico, 2012/12/01 01:41:21]

Is NSS used on IOS? If so, should USE_NSS be set when building on ios? That
seems simpler.

[wtc, 2012/12/01 02:19:43]

NSS is used on iOS to verify certificates. The test
    #if defined(USE_NSS) || defined(OS_IOS)
identifies the platforms where we use NSS to verify certificates.

The meaning of USE_NSS changed several times. The current
meaning of USE_NSS is roughly "use the system NSS libraries".
If USE_NSS is not defined, then we either
1. use our own copy of NSS, or
2. use OpenSSL.

iOS falls under case 1 -- Chrome for iOS contains its own copy
of NSS. So we cannot define USE_NSS for iOS.

If we want to clean up this mess, I think we can do the following.
- Rename USE_NSS to USE_SYSTEM_NSS.
- Add a new macro VERIFY_CERTS_WITH_NSS, which is defined
  if USE_SYSTEM_NSS is defined or OS_IOS is defined.

But that will be a separate (big) CL.

 #include "net/ocsp/nss_ocsp.h"
-#endif  // defined(USE_NSS)
+#endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
@@ -95,16 +95,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
   }
 
  private:
   virtual ~SystemURLRequestContext() {
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
     net::SetURLRequestContextForNSSHttpIO(NULL);
-#endif  // defined(USE_NSS)
+#endif
   }
 };
 
@@ -436,9 +436,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
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
@@ -574,9 +574,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
 
   system_url_request_context_getter_ = NULL;