Revert 263726 "x11: Remove X11 message-pump."

trunk/src/base/base.gypi

 # Copyright (c) 2012 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
       'base_i18n_target': 0,
     },
@@ skipping 715 matching lines @@
               ],
               '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',
+              ],
+          }],
           ['<(toolkit_uses_gtk)==0 or >(nacl_untrusted_build)==1', {
             'sources!': ['message_loop/message_pump_gtk.cc'],
           }],
           ['(OS != "linux" and <(os_bsd) != 1 and OS != "android") or >(nacl_untrusted_build)==1', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
                 'linux_util.cc',
               ],
             },
           ],
@@ skipping 133 matching lines @@
               'posix/file_descriptor_shuffle.cc',
               # Not using sha1_win.cc because it may have caused a
               # regression to page cycler moz.
               'sha1_win.cc',
               'strings/string16.cc',
             ],
           },],
           ['<(use_ozone) == 1', {
             'sources!': [
               'message_loop/message_pump_glib.cc',
+              'message_loop/message_pump_x11.cc',
             ]
           }],
           ['OS == "linux" and >(nacl_untrusted_build)==0', {
             'sources!': [
               'files/file_path_watcher_kqueue.cc',
               'files/file_path_watcher_stub.cc',
             ],
           }],
           ['(OS == "mac" or OS == "ios") and >(nacl_untrusted_build)==0', {
             'sources/': [
@@ skipping 60 matching lines @@
           'i18n/time_formatting.h',
           'i18n/timezone.cc',
           'i18n/timezone.h',
           'i18n/utf8_validator_tables.cc',
           'i18n/utf8_validator_tables.h',
         ],
       }]
     ],
   },
 }