Merge aura::DispatcherLinux into base::MessagePumpAuraX11.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 7eba6fe141e555d9b6df39b6f1bb391bfb8cc92b..c0a0a4f1572bf2796fa95b92776cf03807017610 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -99,8 +99,8 @@
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/output_configurator_animation.h"
+#include "base/message_pump_aurax11.h"
 #include "chromeos/display/output_configurator.h"
-#include "ui/aura/dispatcher_linux.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
@@ -196,9 +196,8 @@ Shell::Shell(ShellDelegate* delegate)
   ui_controls::InstallUIControlsAura(internal::CreateUIControls());
 #if defined(OS_CHROMEOS)
   output_configurator_->AddObserver(output_configurator_animation_.get());
-  static_cast<aura::DispatcherLinux*>(
-      aura::Env::GetInstance()->GetDispatcher())->AddDispatcherForRootWindow(
-          output_configurator());
+  base::MessagePumpAuraX11::Current()->AddDispatcherForRootWindow(
+      output_configurator());
 #endif  // defined(OS_CHROMEOS)
 }
 
@@ -278,10 +277,8 @@ Shell::~Shell() {
 
 #if defined(OS_CHROMEOS)
   output_configurator_->RemoveObserver(output_configurator_animation_.get());
-  // Remove OutputConfigurator from Dispatcher.
-  static_cast<aura::DispatcherLinux*>(
-      aura::Env::GetInstance()->GetDispatcher())->RemoveDispatcherForRootWindow(
-          output_configurator());
+  base::MessagePumpAuraX11::Current()->RemoveDispatcherForRootWindow(
+      output_configurator());
 #endif  // defined(OS_CHROMEOS)
 }