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

content/browser/power_save_blocker_linux.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 "content/browser/power_save_blocker.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 // Xlib #defines Status, but we can't have that for some of our headers.
 #ifdef Status
 #undef Status
 #endif
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop_proxy.h"
 #if defined(TOOLKIT_GTK)
 #include "base/message_pump_gtk.h"
 #else
-#include "base/message_pump_x.h"
+#include "base/message_pump_aurax11.h"
 #endif
 #include "base/nix/xdg_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 using content::BrowserThread;
 
@@ skipping 435 matching lines @@
   // Connection to D-Bus is just a Unix domain socket, which is not
   // a persistent resource, hence the operating system will take care
   // of closing it when the process terminates.
   if (BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) {
     bus_->ShutdownOnDBusThreadAndBlock();
   }
 }
 
 // static
 bool DBusPowerSaveBlocker::DPMSEnabled() {
-#if defined(TOOLKIT_GTK)
-  Display* display = base::MessagePumpGtk::GetDefaultXDisplay();
-#else
-  Display* display = base::MessagePumpX::GetDefaultXDisplay();
-#endif
+  Display* display = base::MessagePumpForUI::GetDefaultXDisplay();
   BOOL enabled = false;
   int dummy;
   if (DPMSQueryExtension(display, &dummy, &dummy) && DPMSCapable(display)) {
     CARD16 state;
     DPMSInfo(display, &state, &enabled);
   }
   return enabled;
 }
 
 // static
 DBusPowerSaveBlocker* DBusPowerSaveBlocker::GetInstance() {
   return Singleton<DBusPowerSaveBlocker>::get();
 }
 
 }  // namespace
 
 // Called only from UI thread.
 // static
 void PowerSaveBlocker::ApplyBlock(PowerSaveBlockerType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DBusPowerSaveBlocker::GetInstance()->ApplyBlock(type);
 }