Rationalize linux vs x11 in ui

ui/ui.gyp

Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index e579ab4a84a79cc7d4d48cb50b3d8457cb6eb78f..582a8cc7cb2292a18ad549fc57df1968ca07259a 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -269,7 +269,7 @@
         'base/resource/resource_bundle.cc',
         'base/resource/resource_bundle.h',
         'base/resource/resource_bundle_android.cc',
-        'base/resource/resource_bundle_aurax11.cc',
+        'base/resource/resource_bundle_auralinux.cc',
         'base/resource/resource_bundle_gtk.cc',
         'base/resource/resource_bundle_ios.mm',
         'base/resource/resource_bundle_mac.mm',
@@ -635,6 +635,12 @@
             'base/x/selection_utils.h',
           ]
         }],
+        
+        ['use_aura==0 or OS!="linux"', {
+          'sources!': [
+            'base/resource/resource_bundle_auralinux.cc',
+          ],
+        }],
         ['use_aura==1 and OS=="win"', {
           'sources/': [
             ['exclude', 'base/dragdrop/drag_utils_aura.cc'],
@@ -814,7 +820,7 @@
             'base/cursor/cursor_loader_null.h',
           ],
         }],
-        ['toolkit_views==0', {
+        ['toolkit_views==0 and use_messagepump_linux==0', {
           'sources!': [
             'base/events/event.cc',
             'base/events/event.h',