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

chrome/chrome_tests.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.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 1471 matching lines @@
         'browser/net/url_info_unittest.cc',
         'browser/notifications/desktop_notification_service_unittest.cc',
         'browser/notifications/desktop_notifications_unittest.cc',
         'browser/notifications/desktop_notifications_unittest.h',
         'browser/notifications/notification_exceptions_table_model_unittest.cc',
         'browser/notifications/notifications_prefs_cache_unittest.cc',
         'browser/parsers/metadata_parser_filebase_unittest.cc',
         'browser/password_manager/encryptor_password_mac_unittest.cc',
         'browser/password_manager/encryptor_unittest.cc',
         'browser/password_manager/login_database_unittest.cc',
+        'browser/password_manager/native_backend_gnome_x_unittest.cc',
         'browser/password_manager/password_form_data.cc',
         'browser/password_manager/password_form_manager_unittest.cc',
         'browser/password_manager/password_manager_unittest.cc',
         'browser/password_manager/password_store_default_unittest.cc',
         'browser/password_manager/password_store_mac_unittest.cc',
         'browser/password_manager/password_store_win_unittest.cc',
+        'browser/password_manager/password_store_x_unittest.cc',
         'browser/plugin_exceptions_table_model_unittest.cc',
         'browser/policy/asynchronous_policy_loader_unittest.cc',
         'browser/policy/asynchronous_policy_provider_unittest.cc',
         'browser/policy/asynchronous_policy_test_base.cc',
         'browser/policy/asynchronous_policy_test_base.h',
         'browser/policy/cloud_policy_controller_unittest.cc',
         'browser/policy/cloud_policy_provider_unittest.cc',
         'browser/policy/cloud_policy_subsystem_unittest.cc',
         'browser/policy/config_dir_policy_provider_unittest.cc',
         'browser/policy/configuration_policy_pref_store_unittest.cc',
@@ skipping 312 matching lines @@
         'browser/ui/cocoa/view_resizer_pong.h',
         'browser/ui/cocoa/view_resizer_pong.mm',
         'browser/ui/cocoa/window_size_autosaver_unittest.mm',
         'browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm',
         'browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm',
         'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm',
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm',
         'browser/ui/content_settings/content_setting_bubble_model_unittest.cc',
         'browser/ui/content_settings/content_setting_image_model_unittest.cc',
         'browser/ui/find_bar/find_backend_unittest.cc',
-        'browser/ui/gtk/accelerators_gtk_unittest.cc',
+        'browser/ui/gtk/accelerators_gtk_unittest.cc',
         'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
         'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
         'browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc',
         'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
         'browser/ui/gtk/gtk_expanded_container_unittest.cc',
         'browser/ui/gtk/gtk_theme_service_unittest.cc',
         'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc',
         'browser/ui/gtk/reload_button_gtk_unittest.cc',
         'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
         'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
@@ skipping 238 matching lines @@
         }, {  # safe_browsing == 0
           'sources!': [
             'browser/download/download_safe_browsing_client_unittest.cc',
           ],
           'sources/': [
             ['exclude', '^browser/safe_browsing/'],
             ['exclude', '^renderer/safe_browsing/'],
           ],
         }],
         ['chromeos==1', {
-          'sources/': [
+          'sources!': [

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

IIRC you need to use sources/ in some weird circumstances because it has
different precedence than sources!

Be careful that this works correctly...

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

Hmm. I just figured this was somebody copy pasting something else, and not
knowing about the sources! feature. I did run it through the trybots, but the
original reason could be very subtle if it was intentional for some precedence
reasons. I guess I'll change it back.

+            'browser/notifications/desktop_notifications_unittest.cc',
+            'browser/password_manager/native_backend_gnome_x_unittest.cc',
             # TODO(thestig) Enable PrintPreviewUI tests on CrOS when
             # print preview is enabled on CrOS.
-            ['exclude', 'browser/notifications/desktop_notifications_unittest.cc'],
-            ['exclude', 'browser/ui/webui/print_preview_ui_unittest.cc'],
+            'browser/ui/webui/print_preview_ui_unittest.cc',
           ],
         }, { # else: chromeos == 0
+          'sources!': [
+            'browser/policy/device_policy_cache_unittest.cc',
+            'browser/policy/enterprise_install_attributes_unittest.cc',
+          ],
           'sources/': [
             ['exclude', '^browser/chromeos/'],
-            ['exclude', '^browser/policy/device_policy_cache_unittest.cc'],
-            ['exclude', '^browser/policy/enterprise_install_attributes_unittest.cc' ],
-            ['exclude', '^browser/ui/webui/chromeos/login'],
+            ['exclude', '^browser/ui/webui/chromeos/login/'],
             ['exclude', '^browser/ui/webui/chromeos/imageburner/'],
           ],
         }],
         ['toolkit_uses_gtk == 1', {
           'conditions': [
             ['selinux==0', {
               'dependencies': [
                 '../sandbox/sandbox.gyp:*',
               ],
             }],
             ['toolkit_views==1', {
               'sources!': [
-                 'browser/ui/gtk/accelerators_gtk_unittest.cc',
-                 '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_expanded_container_unittest.cc',
-                 'browser/ui/gtk/gtk_theme_service_unittest.cc',
-                 'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc',
-                 'browser/ui/gtk/reload_button_gtk_unittest.cc',
-                 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
+                'browser/ui/gtk/accelerators_gtk_unittest.cc',
+                '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_expanded_container_unittest.cc',
+                'browser/ui/gtk/gtk_theme_service_unittest.cc',
+                'browser/ui/gtk/omnibox/omnibox_popup_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 convenience functions directly, so link directly.
+                  'dependencies': [
+                    '../build/linux/system.gyp:gnome-keyring-direct',
+                  ],
+                }, {
+                  # Disable the GNOME Keyring tests if GNOME Keyring is disabled.
+                  'sources!': [
+                    'browser/password_manager/native_backend_gnome_x_unittest.cc',
+                  ],
+                }],
               ],
             }],
           ],
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:ssl',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
             'browser/printing/print_job_unittest.cc',
@@ skipping 147 matching lines @@
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
           'sources!': [
             'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
           ],
         }, { # else: toolkit_views == 0
+          'sources!': [
+            'browser/extensions/key_identifier_conversion_views_unittest.cc',
+          ],
           'sources/': [
             ['exclude', '^browser/ui/views/'],
             ['exclude', '^../views/'],
-            ['exclude', '^browser/extensions/key_identifier_conversion_views_unittest.cc'],
           ],
         }],
         ['use_openssl==1', {
           'sources/': [
             # OpenSSL build does not support firefox importer. See
             # http://crbug.com/64926
             ['exclude', '^browser/importer/'],
           ],
         }],
       ],
@@ skipping 1872 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }