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

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'dependencies': [
@@ skipping 4106 matching lines @@
             ['exclude', '^browser/ui/views/task_manager_view.h'],
             ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'],
             ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
             ['include', '^browser/ui/views/simple_message_box_views.cc'],
             ['include', '^browser/ui/views/simple_message_box_views.h'],
           ],
           'dependencies': [
             '../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',
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:x11',
             '../dbus/dbus.gyp:dbus',
           ],
         }],        
         # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
         # native certificate viewers).
         ['os_posix == 0 or OS == "mac"', {
           'sources/': [
             ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
             ['exclude', '^browser/ui/webui/certificate_viewer.h'],
             ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
             ['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',
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:ssl',
             '../build/linux/system.gyp:x11',
             '../dbus/dbus.gyp:dbus',
             '../third_party/undoview/undoview.gyp:undoview',
@@ skipping 33 matching lines @@
               'include_dirs': [
                 # breakpad_linux.cc uses generated file_version_info_linux.h.
                 '<(SHARED_INTERMEDIATE_DIR)',
                 '../breakpad/src',
               ],
             }, {  # linux_breakpad==0
               'sources': [
                 '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"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
             'browser/first_run/upgrade_util.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
@@ skipping 821 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }