aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it.

ui/aura/monitor_change_observer_x11.cc

 // 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.
 
 #include "ui/aura/monitor_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include <X11/extensions/Xrandr.h>
 
-#include "base/message_pump_x.h"
+#include "base/message_pump_aurax11.h"
 #include "ui/aura/env.h"
 #include "ui/aura/dispatcher_linux.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/monitor.h"
 
 namespace aura {
 namespace internal {
 
 namespace {
@@ skipping 14 matching lines @@
   return NULL;
 }
 
 bool CompareMonitorY(const gfx::Monitor& lhs, const gfx::Monitor& rhs) {
   return lhs.bounds_in_pixel().y() > rhs.bounds_in_pixel().y();
 }
 
 }  // namespace
 
 MonitorChangeObserverX11::MonitorChangeObserverX11()
-    : xdisplay_(base::MessagePumpX::GetDefaultXDisplay()),
+    : xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       xrandr_event_base_(0) {
   XRRSelectInput(xdisplay_, x_root_window_, RRScreenChangeNotifyMask);
   int error_base_ignored;
   XRRQueryExtension(xdisplay_, &xrandr_event_base_, &error_base_ignored);
   static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
       AddDispatcherForRootWindow(this);
 }
 
 MonitorChangeObserverX11::~MonitorChangeObserverX11() {
@@ skipping 75 matching lines @@
   for (std::vector<gfx::Monitor>::iterator iter = monitors.begin();
        iter != monitors.end(); ++iter, ++id)
     (*iter).set_id(id);
 
   Env::GetInstance()->monitor_manager()
       ->OnNativeMonitorsChanged(monitors);
 }
 
 }  // namespace internal
 }  // namespace aura