Support building BoringSSL with NSS certificates.

chrome/chrome_common.gypi

Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 0ecfd4f412ee8c489ef63a7b211a8cc262cb6f84..ec5826c22cb7bb797110fbb322d2095dcad74998 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -611,43 +611,31 @@
         }, {  # OS == ios
           'sources!': [
             'common/net/net_resource_provider.cc',
+          ],
+        }],
+        ['OS == "android" or OS == "ios"', {
+          'sources!': [
             'common/net/x509_certificate_model.cc',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+        ['use_openssl_certs == 1 and OS != "android"', {
             'dependencies': [
-              '../build/linux/system.gyp:ssl',
+              '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
             ],
-          },
-        ],
-        ['os_posix != 1 or OS == "mac" or OS == "ios"', {
+        }, {
             'sources!': [
-              'common/net/x509_certificate_model_nss.cc',
               'common/net/x509_certificate_model_openssl.cc',
             ],
           },
         ],
-        ['OS == "android"', {
+        ['use_nss == 1', {
             'dependencies': [
-              '../third_party/boringssl/boringssl.gyp:boringssl',
-            ],
-            'sources!': [
-              'common/net/x509_certificate_model.cc',
-              'common/net/x509_certificate_model_openssl.cc',
+              '../build/linux/system.gyp:ssl',
             ],
-        }],
-        ['use_openssl==1', {
+        }, {
             'sources!': [
               'common/net/x509_certificate_model_nss.cc',
             ],
-            'dependencies': [
-              '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
-            ],
-          },
-          {  # else !use_openssl: remove the unneeded files
-            'sources!': [
-              'common/net/x509_certificate_model_openssl.cc',
-            ],
           },
         ],
         ['OS=="win"', {