Clean up uses of use_glib that are not related to glib dependencies

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 6fba8d3d022b30cbff88cd926acff97248405a38..ac5de579a0e1bc063b2a6fd5d96b80f7604e82ca 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -35,7 +35,7 @@
         ],
       },
       'conditions': [
-        ['use_glib==1', {
+        ['desktop_linux == 1 or chromeos == 1', {

[Ben Goodger (Google), 2013/11/07 18:48:25]

this is way better.

           'conditions': [
             ['chromeos==1', {
               'sources/': [ ['include', '_chromeos\\.cc$'] ]
@@ -51,7 +51,6 @@
           ],
           'dependencies': [
             'symbolize',
-            '../build/linux/system.gyp:glib',
             'xdg_mime',
           ],
           'defines': [
@@ -60,15 +59,20 @@
           'cflags': [
             '-Wno-write-strings',
           ],
-          'export_dependent_settings': [
-            '../build/linux/system.gyp:glib',
-          ],
-        }, {  # use_glib!=1
+        }, {  # desktop_linux == 0 and chromeos == 0
             'sources/': [
               ['exclude', '/xdg_user_dirs/'],
               ['exclude', '_nss\\.cc$'],
             ],
         }],
+        ['use_glib==1', {
+          'dependencies': [
+            '../build/linux/system.gyp:glib',
+          ],
+          'export_dependent_settings': [
+            '../build/linux/system.gyp:glib',
+          ],
+        }],
         ['use_x11==1', {
           'dependencies': [
             '../build/linux/system.gyp:x11',
@@ -687,7 +691,7 @@
         'module_dir': 'base'
       },
       'conditions': [
-        ['use_glib==1', {
+        ['desktop_linux == 1 or chromeos == 1', {
           'defines': [
             'USE_SYMBOLIZE',
           ],
@@ -748,7 +752,7 @@
             },
           ],
         }],
-        ['use_glib==1', {
+        ['desktop_linux == 1 or chromeos == 1', {

[M-A Ruel, 2014/01/26 20:39:55]

It's duplicate, please merge lines 694-698 into here.

           'sources!': [
             'file_version_info_unittest.cc',
           ],
@@ -763,11 +767,19 @@
             }],
           ],
           'dependencies': [
-            '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:ssl',
+          ],
+        }],
+        ['use_x11 == 1', {
+          'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
-        }, {  # use_glib!=1
+        }],
+        ['use_glib == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:glib',
+          ],
+        }, {  # use_glib == 0
           'sources!': [
             'message_loop/message_pump_glib_unittest.cc',
           ]