Support building BoringSSL with NSS certificates.

chrome/utility/BUILD.gn

Index: chrome/utility/BUILD.gn
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index c469307e10a76cad2fae501d136d89cd9d324839..dbf408f7f39ddb0dddf37ad76fdb9fdc4538ac88 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -83,21 +83,15 @@ static_library("utility") {
     }
   }
 
-  if (use_openssl) {
-    if (!is_win && !is_mac && !is_android) {
-      sources -= [ "importer/nss_decryptor.cc" ]
-    }
-  } else {  # !use_openssl
-    if (!is_win && !is_mac) {
-      sources += [
-        "importer/nss_decryptor_system_nss.cc",
-        "importer/nss_decryptor_system_nss.h",
-      ]
-      deps += [
-        "//crypto",
-        "//crypto:platform",
-      ]
-    }
+  if (use_nss_certs) {

[tfarina, 2015/04/21 21:49:19]

non-owner lgtm for this GN change.

Though with one question. Why don't you need to exclude nss_decryptor.cc
anymore?

[davidben, 2015/04/21 22:16:06]

use_openssl && !is_win && !is_mac_ && !is_android was never true. Those are
precisely the three platforms where we've shipped use_openssl.

That logic was there so that Linux + use_openssl could continue to build,
despite nss_decryptor not actually working. It's paired with
nss_decryptor_null.h which instead defines those functions to be no-ops (whereas
the real NSSDecryptor implementations use nss_decryptor.cc as common code).

This was used because that port used not link with NSS at all and instead use
OpenSSL's X509_verify, a configuration we do not and don't intend to support. It
was mostly used as development convenience in building OpenSSL versions on
Linux.

Now Linux + use_openssl still pulls in NSS, so we can continue to use the old
code and transition off of it incrementally. (When we do manage to ship a
non-use_nss_certs Linux build, we'll need some kind of story for this, either
continue to link with system NSS or perhaps dlopen Firefox's copy like we do on
Mac and Windows.)

On that note, I forgot to remove nss_decryptor_null.h. Fixed.

+    sources += [
+      "importer/nss_decryptor_system_nss.cc",
+      "importer/nss_decryptor_system_nss.h",
+    ]
+    deps += [
+      "//crypto",
+      "//crypto:platform",
+    ]
   }
 
   if (!enable_print_preview) {