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

build/linux/system.gyp

Index: build/linux/system.gyp
===================================================================
--- build/linux/system.gyp	(revision 93060)
+++ build/linux/system.gyp	(working copy)
@@ -340,7 +340,7 @@
       }]]
     },
     {
-      'target_name': 'gnome-keyring',
+      'target_name': 'gnome_keyring',
       'type': 'settings',
       'conditions': [
         ['use_gnome_keyring==1', {
@@ -379,6 +379,39 @@
       ],
     },
     {
+      # 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': {