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 361 matching lines @@
                 'libraries': [
                   '-ldl',
                 ],
               },
             }],
           ],
         }],
       ],
     },
     {
+      'target_name': 'gnome-keyring-direct',

[Evan Martin, 2011/07/18 15:31:00]

I think we normally use underscores for these names.  Not sure though.

Can you put a comment above this describing what this target does?  (Seems like
it's a dependency of anything that wants to link to gnome-keyring directly or
something...)

[Mike Mammarella, 2011/07/19 00:20:35]

Done.

+      'type': 'settings',

[Evan Martin, 2011/07/18 15:31:00]

It turns out this type actually doesn't exist in gyp, but it succeeds due to a
bug in the make generator!  I have been trying to remove it.  Can you use 'none'
instead?

[Mike Mammarella, 2011/07/19 00:20:35]

So, I changed this, and then the unit tests stopped linking with unknown symbol
errors for the symbols I'm using from libgnomekeyring. Changing it back and
forth toggled the errors, so apparently this does have some effect and 'none' is
not the same.

+      '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'],
+              }],
+            ],
+          },
+          # 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.
+          '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)")',
             ],
           },
         }],
       ],
     },
   ],
 }