Make use_nss a gyp var so that aura can build w/ nss.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 33d9e402557ce2b119609f17d3da5ad55e43ac77..efbe1dcb8c0ad0e0679b74b863187182badc6afb 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4124,6 +4124,13 @@
             '../ui/aura/aura.gyp:aura',
           ],
         }],
+        ['OS=="linux"', {
+          'link_settings': {
+            'libraries': [
+              '-lXss',
+            ],
+          },
+        }],        

[mattm, 2011/10/05 02:27:51]

unrelated?

         ['OS=="linux" and use_aura==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
@@ -4142,6 +4149,24 @@
             ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
           ],
         }],
+        ['use_nss==1', {
+          'sources': [
+            'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
+            'third_party/mozilla_security_manager/nsNSSCertHelper.h',
+            'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
+            'third_party/mozilla_security_manager/nsNSSCertificate.h',
+            'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
+            'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
+          ],
+        }],
+        ['use_nss==0 and use_openssl==1', {

[mattm, 2011/10/05 02:27:51]

use_openssl==0

+          'sources!': [
+            'browser/certificate_manager_model.cc',
+            'browser/certificate_manager_model.h',
+            'browser/ui/webui/options/certificate_manager_handler.cc',
+            'browser/ui/webui/options/certificate_manager_handler.h',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
@@ -4195,24 +4220,6 @@
                 'browser/crash_handler_host_linux_stub.cc',
               ],
             }],
-            ['use_openssl==0', {
-              'sources': [
-                'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
-                'third_party/mozilla_security_manager/nsNSSCertHelper.h',
-                'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
-                'third_party/mozilla_security_manager/nsNSSCertificate.h',
-                'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
-                'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
-              ],
-            }],
-          ],
-        }, {  # toolkit_uses_gtk != 1
-          'sources!': [
-            # TODO(mattm): Cert manager stuff is really !USE_NSS.
-            'browser/certificate_manager_model.cc',
-            'browser/certificate_manager_model.h',
-            'browser/ui/webui/options/certificate_manager_handler.cc',
-            'browser/ui/webui/options/certificate_manager_handler.h',
           ],
         }],
         ['OS=="mac"', {