Revert 223621 "x11: Prefer using ui::GetXDisplay() over getting ..."

trunk/src/ui/base/x/events_x.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/base/events/event_constants.h"
 
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
@@ skipping 242 matching lines @@
 
 double GetTouchParamFromXEvent(XEvent* xev,
                               ui::DeviceDataManager::DataType val,
                               double default_value) {
   ui::DeviceDataManager::GetInstance()->GetEventData(
       *xev, val, &default_value);
   return default_value;
 }
 
 Atom GetNoopEventAtom() {
-  return XInternAtom(ui::GetXDisplay(), "noop", False);
+  return XInternAtom(
+      base::MessagePumpX11::GetDefaultXDisplay(),
+      "noop", False);
 }
 
 }  // namespace
 
 namespace ui {
 
 void UpdateDeviceList() {
   Display* display = GetXDisplay();
   DeviceListCacheX::GetInstance()->UpdateDeviceList(display);
   TouchFactory::GetInstance()->UpdateDeviceList(display);
@@ skipping 472 matching lines @@
     noop->xclient.format = 8;
     DCHECK(!noop->xclient.display);
   }
   // Make sure we use atom from current xdisplay, which may
   // change during the test.
   noop->xclient.message_type = GetNoopEventAtom();
   return noop;
 }
 
 }  // namespace ui