Rename use_nss to use_nss_certs in gyp and grit.

net/net_common.gypi

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # This target is included in both 'net' and 'net_small'.
   'type': '<(component)',
   'variables': { 'enable_wexit_time_destructors': 1, },
   'dependencies': [
     '../base/base.gyp:base',
@@ skipping 266 matching lines @@
           'cert_net/nss_ocsp.h',
           'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
           'third_party/mozilla_security_manager/nsKeygenHandler.h',
           'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
           'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
           'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
           'third_party/mozilla_security_manager/nsPKCS12Blob.h',
         ],
       },
     ],
-    [ 'use_nss != 1', {
+    [ 'use_nss_certs != 1', {
         'sources!': [
           'cert/cert_verify_proc_nss.cc',
           'cert/cert_verify_proc_nss.h',
           'ssl/client_cert_store_chromeos.cc',
           'ssl/client_cert_store_chromeos.h',
           'ssl/client_cert_store_nss.cc',
           'ssl/client_cert_store_nss.h',
         ],
     }],
     [ 'enable_websockets != 1', {
@@ skipping 105 matching lines @@
     ['OS == "ios"', {
       'sources/': [
         ['include', '^base/mac/url_conversions\\.h$'],
         ['include', '^base/mac/url_conversions\\.mm$'],
         ['include', '^base/net_util_mac\\.cc$'],
         ['include', '^base/net_util_mac\\.h$'],
         ['include', '^base/network_change_notifier_mac\\.cc$'],
         ['include', '^base/network_config_watcher_mac\\.cc$'],
         ['include', '^base/platform_mime_util_mac\\.mm$'],
         # The iOS implementation only partially uses NSS and thus does not
-        # defines |use_nss|. In particular the |USE_NSS| preprocessor
+        # defines |use_nss_certs|. In particular the |USE_NSS| preprocessor
         # definition is not used. The following files are needed though:
         ['include', '^cert/cert_verify_proc_nss\\.cc$'],
         ['include', '^cert/cert_verify_proc_nss\\.h$'],
         ['include', '^cert/test_root_certs_nss\\.cc$'],
         ['include', '^cert/x509_util_nss\\.cc$'],
         ['include', '^cert/x509_util_nss\\.h$'],
         ['include', '^cert_net/nss_ocsp\\.cc$'],
         ['include', '^cert_net/nss_ocsp\\.h$'],
         ['include', '^proxy/proxy_resolver_mac\\.cc$'],
         ['include', '^proxy/proxy_server_mac\\.cc$'],
       ],
     }],
   ],
 }