gyp: unify toolkit_views usage

chrome/chrome_tests.gypi

 # Copyright (c) 2010 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' : {
     'browser_tests_sources_views_specific': [
       'browser/extensions/browser_action_test_util_views.cc',
       'browser/views/browser_actions_container_browsertest.cc',
     ],
@@ skipping 342 matching lines @@
           ],
           'sources!': [
             # TODO(port)
             'test/ui/layout_plugin_uitest.cc',
           ],
         }, { # else: OS != "linux"
           'sources!': [
             'browser/process_singleton_linux_uitest.cc',
           ],
         }],
-        ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
+        ['OS=="linux" and toolkit_views==1', {
+          'sources!': [
+            'browser/download/download_uitest.cc',
+          ],
+        }],
+        ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
-          'sources!': [
-            'browser/download/download_uitest.cc',
-          ],
         }],
         ['OS=="mac"', {
           'sources!': [
             # TODO(port)
             'app/chrome_main_uitest.cc',
             'browser/metrics/metrics_service_uitest.cc',
             # leaves an extra window on screen after test completes.
             'browser/sessions/session_restore_uitest.cc',
             # puts up modal dialogs.
             'browser/unload_uitest.cc',
             'common/logging_chrome_uitest.cc',
             'test/ui/fast_shutdown_uitest.cc',
             'test/ui/layout_plugin_uitest.cc',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             'crash_service',  # run time dependency
             'security_tests',  # run time dependency
             'test_support_common',
             '../google_update/google_update.gyp:google_update',
-            '../views/views.gyp:views',
             '<(allocator_target)',
           ],
           'link_settings': {
             'libraries': [
               '-lOleAcc.lib',
             ],
           },
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
@@ skipping 635 matching lines @@
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources': [
             'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
           ],
           'sources!': [
             'browser/views/bookmark_context_menu_test.cc',
           ],
         }],
-        ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
+        ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
+        }],
+        ['OS=="linux" and toolkit_views==1', {
           'sources': [
             '<@(views_unit_tests_sources)',
           ],
           # We must use 'sources/' instead of 'source!' as there is a
           # target-default 'sources/' including gtk_unittest and 'source/' takes
           # precedence over 'sources!'.
           'sources/': [
              ['exclude', 'browser/gtk/bookmark_bar_gtk_unittest\\.cc$'],
              ['exclude', 'browser/gtk/bookmark_editor_gtk_unittest\\.cc$'],
              ['exclude', 'browser/gtk/go_button_gtk_unittest\\.cc$'],
@@ skipping 48 matching lines @@
         }],
         ['OS=="win"', {
           'defines': [
             '__STD_C',
             '_CRT_SECURE_NO_DEPRECATE',
             '_SCL_SECURE_NO_DEPRECATE',
           ],
           'dependencies': [
             'chrome_dll_version',
             'installer/installer.gyp:installer_util_strings',
-            '../views/views.gyp:views',
             'test_chrome_plugin',  # run time dependency
             '<(allocator_target)',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
             'app/chrome_dll.rc',
             'test/data/resource.rc',
 
@@ skipping 221 matching lines @@
               },
             },
           }
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
+        ['OS=="linux" and toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
           'sources': [
             '<@(browser_tests_sources_views_specific)',
           ],
         }],
         ['OS=="linux" and chromeos==1', {
           'sources': [
             'browser/chromeos/compact_location_bar_host_browsertest.cc',
             'browser/chromeos/compact_navigation_bar_browsertest.cc',
             'browser/chromeos/cros/cros_in_process_browser_test.cc',
             'browser/chromeos/cros/cros_in_process_browser_test.h',
             'browser/chromeos/cros/mock_mount_library.cc',
             'browser/chromeos/cros/mock_mount_library.h',
             'browser/chromeos/login/account_screen_browsertest.cc',
             'browser/chromeos/login/login_browsertest.cc',
             'browser/chromeos/login/login_manager_view_browsertest.cc',
             'browser/chromeos/login/network_screen_browsertest.cc',
             'browser/chromeos/login/wizard_controller_browsertest.cc',
             'browser/chromeos/notifications/notification_browsertest.cc',
             'browser/chromeos/panels/panel_browsertest.cc',
             'browser/chromeos/status/clock_menu_button_browsertest.cc',
             'browser/chromeos/status/power_menu_button_browsertest.cc',
           ],
         }],
-        ['OS=="linux" and toolkit_views==0 and chromeos==0', {
+        ['OS=="linux" and toolkit_views==0', {
           'sources': [
             'browser/extensions/browser_action_test_util_gtk.cc',
             'browser/gtk/view_id_util_browsertest.cc',
           ],
         }],
         ['OS=="mac"', {
           'sources': [
             'browser/extensions/browser_action_test_util_mac.mm',
           ],
           'include_dirs': [
@@ skipping 42 matching lines @@
         'test/startup/shutdown_test.cc',
         'test/startup/startup_test.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
+        ['OS=="linux" and toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             '<(allocator_target)',
           ],
           'configurations': {
             'Debug_Base': {
@@ skipping 75 matching lines @@
       'sources': [
         'test/page_cycler/page_cycler_test.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['OS=="win" or (OS=="linux" and (toolkit_views==1 or chromeos==1))', {
+        ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
       ],
     },
     {
       'target_name': 'tab_switching_test',
       'type': 'executable',
       'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98',
@@ skipping 258 matching lines @@
       'conditions': [
         # Plugin code.
         ['OS=="linux" or OS=="win"', {
           'dependencies': [
             'plugin',
            ],
           'export_dependent_settings': [
             'plugin',
           ],
         }],
-        # Linux-specific rules.
         ['OS=="linux"', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
            ],
         }],
-        # Windows-specific rules.
         ['OS=="win"', {
           'sources': [
             'app/chrome_dll.rc',
             'app/chrome_dll_version.rc.version',
             'test/data/resource.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
@@ skipping 88 matching lines @@
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
               'sources!': [
                 # TODO(port):
                 'browser/safe_browsing/filter_false_positive_perftest.cc',
                 'browser/visitedlink_perftest.cc',
               ],
             }],
-            ['OS=="win" or (OS=="linux" and (toolkit_views==1 or chromeos==1))', {
+            ['toolkit_views==1', {
               'dependencies': [
                 '../views/views.gyp:views',
               ],
             }],
             ['OS=="win"', {
               'configurations': {
                 'Debug_Base': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ skipping 278 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: