gyp: unify toolkit_views usage

chrome/test/interactive_ui/interactive_ui_tests.gypi

 {
   'target_name': 'interactive_ui_tests',
   'type': 'executable',
   'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0',
   'dependencies': [
     '<(DEPTH)/chrome/chrome.gyp:chrome',
     '<(DEPTH)/chrome/chrome.gyp:chrome_resources',
     '<(DEPTH)/chrome/chrome.gyp:chrome_strings',
     '<(DEPTH)/chrome/chrome.gyp:debugger',
     '<(DEPTH)/chrome/chrome.gyp:test_support_common',
@@ skipping 32 matching lines @@
     '<(DEPTH)/chrome/test/interactive_ui/keyboard_access_uitest.cc',
     '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
     '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
     '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
     '<(DEPTH)/chrome/test/test_launcher/out_of_proc_test_runner.cc',
     '<(DEPTH)/chrome/test/test_launcher/test_runner.cc',
     '<(DEPTH)/chrome/test/test_launcher/test_runner.h',
     '<(DEPTH)/chrome/test/unit/chrome_test_suite.h',
   ],
   'conditions': [
-    ['OS=="linux" and toolkit_views==0 and chromeos==0', {
+    ['OS=="linux"', {
       'dependencies': [
         '<(DEPTH)/build/linux/system.gyp:gtk',
         '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
       ],
+    }],
+    ['OS=="linux" and toolkit_views==0', {
       'sources!': [
         # TODO(port)
         '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc',
         '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
         '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
         '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
         '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
         '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
       ],
-    }],  # OS=="linux"
-    ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
-      'dependencies': [
-        '<(DEPTH)/build/linux/system.gyp:gtk',

[sky, 2010/04/27 14:50:13]

Where are these dependencies expressed now?

[Evan Martin, 2010/04/27 16:17:54]

system/xdisplaycheck: now on L53
views.gyp: now on L100

The idea is that shared linux stuff should be in a linux branch, and shared
views stuff in a views branch, rather than duplicating the dependency lists. 
(Ideally these branches, that test both linux+views, will eventually go away;
they're currently here just for files that haven't yet been ported.)

-        '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-        '<(DEPTH)/views/views.gyp:views',
-      ],
+    }],
+    ['OS=="linux" and toolkit_views==1', {
       'sources!': [
         '<(DEPTH)/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc',
         # TODO(port)
         '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
       ],
-    }],  # OS=="linux" and (toolkit_views==1 or chromeos==1)
+    }],
     ['target_arch!="x64" and target_arch!="arm"', {
       'dependencies': [
         # run time dependency
         '<(DEPTH)/webkit/webkit.gyp:npapi_test_plugin',
       ],
     }],  # target_arch
     ['OS=="mac"', {
       'sources!': [
         # TODO(port)
         '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc',
         '<(DEPTH)/chrome/browser/browser_focus_uitest.cc',
         '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc',
         '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc',
         '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc',
         '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
         '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
         '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
         '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
         '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
       ],
     }],  # OS=="mac"
+    ['toolkit_views==1', {
+      'dependencies': [
+        '<(DEPTH)/views/views.gyp:views',
+      ],
+    }],
     ['OS=="win"', {
       'include_dirs': [
         '<(DEPTH)/third_party/wtl/include',
       ],
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_resources',
         '<(DEPTH)/chrome/chrome.gyp:chrome_dll_version',
         '<(DEPTH)/chrome/chrome.gyp:crash_service',  # run time dependency
         '<(DEPTH)/chrome/installer/installer.gyp:installer_util_strings',
-        '<(DEPTH)/views/views.gyp:views',
       ],
       'sources': [
         '<(DEPTH)/webkit/glue/resources/aliasb.cur',
         '<(DEPTH)/webkit/glue/resources/cell.cur',
         '<(DEPTH)/webkit/glue/resources/col_resize.cur',
         '<(DEPTH)/webkit/glue/resources/copy.cur',
         '<(DEPTH)/webkit/glue/resources/row_resize.cur',
         '<(DEPTH)/webkit/glue/resources/vertical_text.cur',
         '<(DEPTH)/webkit/glue/resources/zoom_in.cur',
         '<(DEPTH)/webkit/glue/resources/zoom_out.cur',
@@ skipping 27 matching lines @@
           'msvs_settings': {
             'VCLinkerTool': {
               'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
             },
           },
         },
       },  # configurations
     }],  # OS=="win"
   ],  # conditions
 }