Merge aura::DispatcherLinux into base::MessagePumpAuraX11.

ui/aura/aura.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 51 matching lines @@
         'desktop/desktop_cursor_client.cc',
         'desktop/desktop_cursor_client.h',
         'desktop/desktop_dispatcher_client.cc',
         'desktop/desktop_dispatcher_client.h',
         'desktop/desktop_screen.h',
         'desktop/desktop_screen_win.cc',
         'desktop/desktop_screen_win.h',
         'desktop/desktop_screen_x11.cc',
         'desktop/desktop_stacking_client.cc',
         'desktop/desktop_stacking_client.h',
-        'dispatcher_linux.cc',
-        'dispatcher_linux.h',
+        'device_list_updater_aurax11.cc',
+        'device_list_updater_aurax11.h',
         'dispatcher_win.cc',
         'display_observer.cc',
         'display_observer.h',
         'env.cc',
         'env.h',
         'env_observer.h',
         'event_filter.h',
         'focus_change_observer.h',
         'focus_manager.cc',
         'focus_manager.h',
@@ skipping 199 matching lines @@
         # osmesa GL implementation is used on linux.
         ['OS=="linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
       ],
     },
   ],
 }