Adding macro to enable changing SSL library (Part 1)

net/BUILD.gn

Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 511f6450850811d2f89068788bceea2345b98f2f..d10feb9c758b65b61fc14dc32420701735893a5b 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -66,6 +66,9 @@ config("net_config") {
   if (disable_ftp_support) {
     defines += [ "DISABLE_FTP_SUPPORT=1" ]
   }
+  if (use_nss_verifier) {
+    defines += [ "USE_NSS_VERIFIER=1" ]
+  }

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

This is already in build/config/BUILD.gn, right?

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

Done.

 }
 
 # net_internal_config is shared with net and net_small.
@@ -182,14 +185,7 @@ if (!is_nacl) {
       "ssl/token_binding_nss.cc",
     ]
     if (is_ios) {
-      # Always removed for !ios below.
-      net_shared_sources -= [
-        "cert/cert_verify_proc_nss.cc",
-        "cert/cert_verify_proc_nss.h",
-      ]
-    }
-    if (!use_nss_certs && !is_ios) {
-      net_shared_sources -= [ "cert/x509_util_nss.h" ]
+      net_shared_sources -= [ "cert/x509_util_ios.cc" ]
     }
   } else {
     net_shared_sources -= [
@@ -294,9 +290,9 @@ if (!is_nacl) {
       "third_party/mozilla_security_manager/nsPKCS12Blob.cpp",
       "third_party/mozilla_security_manager/nsPKCS12Blob.h",
     ]
-    if (!is_ios) {
-      # These files are part of the partial implementation of NSS on iOS so
-      # keep them in that case (even though use_nss_certs is not set).
+    if (!use_nss_verifier) {

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

Nit: Should this be outside of the !use_nss_certs block? I think it's
equivalent, but the other use_nss_verifier checks are treated as independent.

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

Done.

+      # These files are part of the partial implementation of NSS for
+      # cert verification, so keep them in that case.
       net_shared_sources -= [
         "cert/cert_verify_proc_nss.cc",
         "cert/cert_verify_proc_nss.h",
@@ -713,7 +709,7 @@ source_set("test_support") {
     public_deps += [ "//third_party/protobuf:py_proto" ]
   }
 
-  if (use_nss_certs || is_ios) {
+  if (use_nss_verifier) {
     public_deps += [ "//crypto:platform" ]
   }
 
@@ -1503,9 +1499,8 @@ test("net_unittests") {
     sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ]
   }
 
-  if (!use_nss_certs && !is_ios) {
-    # Only include this test when on Posix and using NSS for
-    # cert verification or on iOS (which also uses NSS for certs).
+  if (!use_nss_verifier) {
+    # Only include this test when using NSS for cert verification.
     sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
   }