Remove usages of XInternAtom

gpu/ipc/service/gpu_watchdog_thread.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 "gpu/ipc/service/gpu_watchdog_thread.h"
 
 #include <errno.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #if defined(USE_X11)
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
+
+#include "ui/base/x/x11_util.h"  // nogncheck
 #endif
 
 namespace gpu {
 namespace {
 
 #if defined(CYGPROFILE_INSTRUMENTATION)
 const int kGpuTimeout = 30000;
 #elif defined(OS_WIN)
 // Use a slightly longer timeout on Windows due to prevalence of slow and
 // infected machines.
@@ skipping 377 matching lines @@
   *((volatile int*)0) = 0x1337;
 
   terminated = true;
 }
 
 #if defined(USE_X11)
 void GpuWatchdogThread::SetupXServer() {
   display_ = XOpenDisplay(NULL);
   window_ = XCreateWindow(display_, DefaultRootWindow(display_), 0, 0, 1, 1, 0,
                           CopyFromParent, InputOutput, CopyFromParent, 0, NULL);
-  atom_ = XInternAtom(display_, "CHECK", False);

[sadrul, 2017/06/01 20:45:30]

I think we need to keep this. Different displays.

[Tom Anderson, 2017/06/01 21:20:42]

Done.  (but for the record, I think atom IDs are the same for each connection
for 1 server)

+  atom_ = ui::GetAtom("CHECK");
   host_tty_ = GetActiveTTY();
 }
 
 void GpuWatchdogThread::SetupXChangeProp() {
   XChangeProperty(display_, window_, atom_, XA_STRING, 8, PropModeReplace, text,
                   (arraysize(text) - 1));
 }
 
 bool GpuWatchdogThread::MatchXEventAtom(XEvent* event) {
   if (event->xproperty.window == window_ && event->type == PropertyNotify &&
@@ skipping 82 matching lines @@
     int tty_number;
     size_t num_res = sscanf(tty_string, "tty%d\n", &tty_number);
     if (num_res == 1)
       return tty_number;
   }
   return -1;
 }
 #endif
 
 }  // namespace gpu