Adding macro to enable changing SSL library (Part 1)

crypto/nss_util.cc

Index: crypto/nss_util.cc
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index a7cb9e80002d01b30e930d077845f26e19ce0dfd..0fc4f3523b51ffd0979f097f47650af15dd8b65b 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -715,9 +715,9 @@ class NSSInitSingleton {
         CrashOnNSSInitFailure();
         return;
       }
-#if defined(OS_IOS)
+#if defined(OS_IOS) && !defined(USE_OPENSSL)

[davidben, 2016/03/17 19:48:08]

Shouldn't OS_IOS && USE_OPENSSL be impossible in this file?

[svaldez, 2016/03/17 20:04:18]

Done.

       root_ = InitDefaultRootCerts();
-#endif  // defined(OS_IOS)
+#endif  // defined(OS_IOS) && !defined(USE_OPENSSL)
     } else {
 #if defined(USE_NSS_CERTS)
       base::FilePath database_dir = GetInitialConfigDirectory();
@@ -803,7 +803,7 @@ class NSSInitSingleton {
     }
   }
 
-#if defined(USE_NSS_CERTS) || defined(OS_IOS)
+#if defined(USE_NSS_VERIFIER)

[davidben, 2016/03/17 19:48:08]

Are there any cases where this ifdef is false and we build this? (I probably
should have just removed this earlier.)

[svaldez, 2016/03/17 20:04:18]

Done.

   // Load nss's built-in root certs.
   SECMODModule* InitDefaultRootCerts() {
     SECMODModule* root = LoadModule("Root Certs", "libnssckbi.so", NULL);