Make the gyp files more cross-platform across the Unices

content/content_common.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.
 
 {
   'targets': [
     {
       'target_name': 'content_common',
       'type': '<(library)',
       'dependencies': [
@@ skipping 242 matching lines @@
         ['OS=="mac"', {
           'sources!': [
             'common/process_watcher_posix.cc',
           ],
           'link_settings': {
             'mac_bundle_resources': [
               'common/common.sb',
             ],
           },
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk==1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
-        ['OS=="linux" and target_arch!="arm"', {
+        ['use_x11==1 and target_arch!="arm"', {
           'sources': [
             'common/gpu/x_util.cc',
             'common/gpu/x_util.h',
           ],
         }],
         ['toolkit_views==1', {
           'sources': [
             'common/native_web_keyboard_event_views.cc',
           ],
         }],
         ['enable_gpu==1', {
           'dependencies': [
             '../gpu/gpu.gyp:command_buffer_service',
           ],
         }],
       ],
     },
   ],
 }