Upstream minor iOS crypto diffs.

crypto/nss_util.cc

Index: crypto/nss_util.cc
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 8b62294ddafc9d9bc08b835ce1d1d01d82a64ec2..db89a7003a0ad0a490a6659dd83c272a591fca90 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -452,6 +452,9 @@ class NSSInitSingleton {
         LOG(ERROR) << "Error initializing NSS without a persistent "
                       "database: " << GetNSSErrorMessage();
       }
+#if defined(OS_IOS)
+      root_ = InitDefaultRootCerts();
+#endif  // defined(OS_IOS)
     } else {
 #if defined(USE_NSS)
       FilePath database_dir = GetInitialConfigDirectory();
@@ -538,7 +541,7 @@ class NSSInitSingleton {
     }
   }
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_IOS)
   // Load nss's built-in root certs.
   SECMODModule* InitDefaultRootCerts() {
     SECMODModule* root = LoadModule("Root Certs", "libnssckbi.so", NULL);