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 636171ae6e537143384f20c18301960f13f4c6c4..799c6051f0e63aa2fae879feccff7a679472cc19 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -319,8 +319,6 @@
         'browser/bug_report_data.h',
         'browser/bug_report_util.cc',
         'browser/bug_report_util.h',
-        'browser/certificate_manager_model.cc',
-        'browser/certificate_manager_model.h',

[mattm, 2011/10/05 03:44:47]

These should stay here and be excluded when we don't need them.  (There's a
general idiom of doing that.   Some IDE like VS let you search among all files
even ones the platform doesn't use, but only if they are listed here and then
excluded later.)

[DaveMoore, 2011/10/05 04:02:57]

Done.

         'browser/certificate_viewer.cc',
         'browser/certificate_viewer.h',
         'browser/character_encoding.cc',
@@ -4166,6 +4164,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==1 or use_openssl==1', {
+          'sources': [

[mattm, 2011/10/05 03:44:47]

Should keep it the excluding way

[DaveMoore, 2011/10/05 04:02:57]

Done.

+            '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',
@@ -4219,24 +4235,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"', {
@@ -4996,7 +4994,6 @@
             ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
             ['include', '^browser/ui/views/select_file_dialog.cc'],
             ['include', '^browser/ui/views/stubs_aura.cc'],
-            ['include', '^browser/ui/webui/options/certificate_manager_handler.cc'],
           ],
         }],
         [ 'use_openssl==1', {