Linux: revive a mysteriously disabled test and add tests for the GNOME Keyring native backend.

build/linux/system.gyp

 # 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.
 
 {
   'conditions': [
     ['sysroot!=""', {
       'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
       },
@@ skipping 322 matching lines @@
       'conditions': [
         ['_toolset=="target"', {
           'link_settings': {
             'libraries': [
               '-lselinux',
             ],
           },
       }]]
     },
     {
-      'target_name': 'gnome-keyring',
+      'target_name': 'gnome_keyring',
       'type': 'settings',
       'conditions': [
         ['use_gnome_keyring==1', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gnome-keyring-1)',
             ],
             'defines': [
               'USE_GNOME_KEYRING',
             ],
@@ skipping 18 matching lines @@
                 'libraries': [
                   '-ldl',
                 ],
               },
             }],
           ],
         }],
       ],
     },
     {
+      # The unit tests use a few convenience functions from the GNOME
+      # Keyring library directly. We ignore linux_link_gnome_keyring and
+      # link directly in this version of the target to allow this.
+      # *** Do not use this target in the main binary! ***
+      'target_name': 'gnome_keyring_direct',
+      'type': 'settings',
+      'conditions': [
+        ['use_gnome_keyring==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags gnome-keyring-1)',
+            ],
+            'defines': [
+              'USE_GNOME_KEYRING',
+            ],
+            'conditions': [
+              ['linux_link_gnome_keyring==0', {
+                'defines': ['DLOPEN_GNOME_KEYRING'],
+              }],
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
+            ],
+          },
+        }],
+      ],
+    },
+    {
       'target_name': 'dbus-glib',
       'type': 'settings',
       'direct_dependent_settings': {
         'cflags': [
           '<!@(<(pkg-config) --cflags dbus-glib-1)',
         ],
       },
       'link_settings': {
         'ldflags': [
           '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
@@ skipping 32 matching lines @@
             ],
             'libraries': [
               '<!@(<(pkg-config) --libs-only-l "ibus-1.0 >= <(ibus_min_version)")',
             ],
           },
         }],
       ],
     },
   ],
 }