linux_aura: Default use_gnome_keyring% to on when use_aura=1.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 2328 matching lines @@
                 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
                 'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
                 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
                 'browser/ui/gtk/gtk_theme_service_unittest.cc',
                 'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc',
                 'browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc',
                 'browser/ui/gtk/reload_button_gtk_unittest.cc',
                 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
               ],
             }],
-            ['chromeos==0', {
-              'conditions': [
-                ['use_gnome_keyring==1', {
-                  # We use a few library functions directly, so link directly.
-                  'dependencies': [
-                    '../build/linux/system.gyp:gnome_keyring_direct',
-                  ],
-                }],
-              ],
-            }],
           ],
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../build/linux/system.gyp:gtk',
             '../dbus/dbus.gyp:dbus_test_support',
             '../sandbox/sandbox.gyp:*',
           ],
         }, { # else: toolkit_uses_gtk != 1
           'sources!': [
             'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
             '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
           ],
         }],
         ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['use_gnome_keyring == 0', {
           # Disable the GNOME Keyring tests if we are not using it.
           'sources!': [
             'browser/password_manager/native_backend_gnome_x_unittest.cc',
           ],
+        }, {
+          # We use a few library functions directly, so link directly.
+          'dependencies': [
+            '../build/linux/system.gyp:gnome_keyring_direct',
+          ],
         }],
         ['OS=="linux" and use_aura==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../dbus/dbus.gyp:dbus_test_support',
             '../ui/aura/aura.gyp:aura_test_support',
           ],
         }],
         ['OS=="linux" and branding=="Chrome" and target_arch=="ia32"', {
           'configurations': {
@@ skipping 515 matching lines @@
             'browser/ui/app_list/test/fake_profile_store.h',
             'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
             'browser/ui/views/app_list/linux/app_list_linux_unittest.cc',
             'browser/ui/views/app_list/win/app_list_win_unittest.cc',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }