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

trunk/src/content/browser/power_save_blocker_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 "content/browser/power_save_blocker_impl.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/files/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/message_loop_proxy.h"
+#include "base/message_loop/message_pump_x11.h"
 #include "base/nix/xdg_util.h"
 #include "base/synchronization/lock.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"
 #include "ui/gfx/x/x11_types.h"
 
 namespace {
@@ skipping 251 matching lines @@
   // We don't care about checking the result. We assume it works; we can't
   // really do anything about it anyway if it fails.
   inhibit_cookie_ = 0;
 
   bus_->ShutdownAndBlock();
   bus_ = NULL;
 }
 
 // static
 bool PowerSaveBlockerImpl::Delegate::DPMSEnabled() {
-  XDisplay* display = gfx::GetXDisplay();
+  XDisplay* 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
@@ skipping 22 matching lines @@
     PowerSaveBlockerType type, const std::string& reason)
     : delegate_(new Delegate(type, reason)) {
   delegate_->Init();
 }
 
 PowerSaveBlockerImpl::~PowerSaveBlockerImpl() {
   delegate_->CleanUp();
 }
 
 }  // namespace content