gyp: unify toolkit_views usage

chrome/test/interactive_ui/interactive_ui_tests.gypi

Index: chrome/test/interactive_ui/interactive_ui_tests.gypi
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index e8cd845ab07d97241360c827357bb5641bb6698c..f003402a87718b800e22e02870a456edb1dbf4a4 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -50,11 +50,13 @@
     '<(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',
@@ -64,19 +66,14 @@
         '<(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
@@ -98,6 +95,11 @@
         '<(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',
@@ -107,7 +109,6 @@
         '<(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',