Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1

chrome/chrome_tests.gypi

 # Copyright 2013 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',
       'common/pref_names.cc',
@@ skipping 96 matching lines @@
           'configurations': {
             'Release': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'WholeProgramOptimization': 'false',
                 },
               },
             },
           },
         },],
-        ['use_x11 == 1', {
+        ['use_x11==1', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
@@ skipping 120 matching lines @@
         'test/base/ui_controls_aurawin.cc',
         'test/base/ui_controls_aurax11.cc',
         'test/base/ui_controls_gtk.cc',
         'test/base/ui_controls_internal_win.cc',
         'test/base/ui_controls_internal_win.h',
         'test/base/ui_controls_mac.mm',
         'test/base/ui_controls_win.cc',
         'test/ppapi/ppapi_interactive_browsertest.cc',
       ],
       'conditions': [
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
             'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
           ],
         }],
         ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
@@ skipping 284 matching lines @@
         'test/webdriver/webdriver_session.h',
         'test/webdriver/webdriver_session_manager.cc',
         'test/webdriver/webdriver_session_manager.h',
         'test/webdriver/webdriver_switches.cc',
         'test/webdriver/webdriver_switches.h',
         'test/webdriver/webdriver_util.cc',
         'test/webdriver/webdriver_util.h',
         'test/webdriver/webdriver_util_mac.mm',
       ],
       'conditions': [
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
             'test/webdriver/keycode_text_conversion_x.cc',
           ],
         }],
         ['toolkit_uses_gtk == 0', {
           'sources!': [
             'test/webdriver/keycode_text_conversion_gtk.cc',
           ],
         }],
@@ skipping 1084 matching lines @@
             'app/chrome_dll_resource.h',
             'app/chrome_version.rc.version',
             # TODO(port): http://crbug.com/45770
             'browser/printing/printing_layout_browsertest.cc',
             'browser/ui/views/message_center/web_notification_tray_win_browsertest.cc',
           ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['OS=="mac"', {
           'include_dirs': [
             '../third_party/GTM',
@@ skipping 198 matching lines @@
             },
           }
         }, { # else: OS != "win"
           'sources!': [
             'app/chrome_command_ids.h',
             'app/chrome_dll.rc',
             'app/chrome_dll_resource.h',
             'app/chrome_version.rc.version',
           ],
         }],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['OS=="mac"', {
           'include_dirs': [
             '../third_party/GTM',
@@ skipping 137 matching lines @@
                 },
               },
             },
           },
         }],
         ['OS=="mac"', {
           'sources': [
             'test/perf/mach_ports_test.cc',
           ],
         }],
+        ['use_x11==1', {
+          'dependencies': [
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
@@ skipping 415 matching lines @@
             'browser/net/sqlite_persistent_cookie_store_perftest.cc',
             'common/json_value_serializer_perftest.cc',
             'test/perf/perftests.cc',
             'test/perf/url_parse_perftest.cc',
 
             # TODO(boliu): Move this to a separate components_perftest target
             # under components/.
             '../components/visitedlink/test/visitedlink_perftest.cc',
           ],
           'conditions': [
+            ['use_x11==1', {
+              'dependencies': [
+                '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+              ],
+            }],
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
-                '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
             ['OS=="win"', {
               'configurations': {
                 'Debug_Base': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                     },
                   },
@@ skipping 501 matching lines @@
             'sync_integration_tests.isolate',
           ],
           'sources': [
             'sync_integration_tests.isolate',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }