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

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index eeda3e12d7a160275dfab40d7ab10954c4c2bc08..955233cadd45d8dee09449351bb8537a75a4134b 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -699,13 +699,21 @@
           4018,
         ],
         'target_conditions': [
-          ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
+          ['(<(desktop_linux) == 0 and <(chromeos) == 0) or >(nacl_untrusted_build)==1', {
               'sources/': [
                 ['exclude', '^nix/'],
               ],
               'sources!': [
                 'atomicops_internals_x86_gcc.cc',
+              ],
+          }],
+          ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
+              'sources!': [
                 'message_loop/message_pump_glib.cc',
+              ],
+          }],
+          ['<(use_x11)==0 or >(nacl_untrusted_build)==1', {
+              'sources!': [
                 'message_loop/message_pump_x11.cc',
               ],
           }],