Reland 102005 and 102009: aura: Explicitly disable GTK.

base/base.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 126 matching lines @@
         'file_version_info_unittest.cc',
         'gmock_unittest.cc',
         'id_map_unittest.cc',
         'i18n/break_iterator_unittest.cc',
         'i18n/char_iterator_unittest.cc',
         'i18n/case_conversion_unittest.cc',
         'i18n/file_util_icu_unittest.cc',
         'i18n/icu_string_conversions_unittest.cc',
         'i18n/number_formatting_unittest.cc',
         'i18n/rtl_unittest.cc',
-        'i18n/string_search_unittest.cc',
+        'i18n/string_search_unittest.cc',
         'i18n/time_formatting_unittest.cc',
         'json/json_reader_unittest.cc',
         'json/json_writer_unittest.cc',
         'json/string_escape_unittest.cc',
         'lazy_instance_unittest.cc',
         'linked_list_unittest.cc',
         'logging_unittest.cc',
         'mac/mac_util_unittest.mm',
         'mac/objc_property_releaser_unittest.mm',
         'md5_unittest.cc',
@@ skipping 92 matching lines @@
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'includes': ['../build/nocompile.gypi'],
       'variables': {
          # TODO(ajwong): Is there a way to autodetect this?
         'module_dir': 'base'
       },
       'conditions': [
-        ['toolkit_uses_gtk==1', {
+        ['use_glib==1', {
           'sources!': [
             'file_version_info_unittest.cc',
           ],
-          'sources': [
-            'nix/xdg_util_unittest.cc',
-          ],
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
                   'allocator/allocator.gyp:allocator',
                 ],
               },
             ],
             ['gcc_version==44', {
               # Avoid gcc 4.4 strict aliasing issues in stl_tree.h when
               # building mru_cache_unittest.cc.
               'cflags': [
                 '-fno-strict-aliasing',
               ],
             }],
+            [ 'toolkit_uses_gtk==1', {
+              'sources': [
+                'nix/xdg_util_unittest.cc',
+              ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ]
+            }],
           ],
           'dependencies': [
-            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:ssl',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
-        }, {  # toolkit_uses_gtk!=1
+        }, {  # use_glib!=1
           'sources!': [
             'message_pump_glib_unittest.cc',
           ]
         }],
         # This is needed to trigger the dll copy step on windows.
         # TODO(mark): This should not be necessary.
         ['OS == "win"', {
           'dependencies': [
             '../third_party/icu/icu.gyp:icudata',
           ],
@@ skipping 115 matching lines @@
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
         },
       ],
     }],
   ],
 }