Move ui::GetAtom to gfx::GetAtom

ui/base/idle/screensaver_window_finder_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/base/idle/screensaver_window_finder_x11.h"
 
 #include <X11/extensions/scrnsaver.h>
 
 #include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 
 namespace ui {
 
 ScreensaverWindowFinder::ScreensaverWindowFinder()
     : exists_(false) {
 }
 
 bool ScreensaverWindowFinder::ScreensaverWindowExists() {
   XScreenSaverInfo info;
   XDisplay* display = gfx::GetXDisplay();
   XID root = DefaultRootWindow(display);
   static int xss_event_base;
   static int xss_error_base;
   static bool have_xss =
       XScreenSaverQueryExtension(display, &xss_event_base, &xss_error_base);
   if (have_xss && XScreenSaverQueryInfo(display, root, &info) &&
       info.state == ScreenSaverOn) {
     return true;
   }
 
   // Ironically, xscreensaver does not conform to the XScreenSaver protocol, so
   // info.state == ScreenSaverOff or info.state == ScreenSaverDisabled does not
   // necessarily mean that a screensaver is not active, so add a special check
   // for xscreensaver.
-  static XAtom lock_atom = GetAtom("LOCK");
+  XAtom lock_atom = gfx::GetAtom("LOCK");
   std::vector<int> atom_properties;
   if (GetIntArrayProperty(root, "_SCREENSAVER_STATUS", &atom_properties) &&
       atom_properties.size() > 0) {
     if (atom_properties[0] == static_cast<int>(lock_atom)) {
       return true;
     }
   }
 
   // Also check the top level windows to see if any of them are screensavers.
   gfx::X11ErrorTracker err_tracker;
@@ skipping 21 matching lines @@
   // For all others, like gnome-screensaver, the window's WM_CLASS property
   // should contain "screensaver".
   std::string value;
   if (!ui::GetStringProperty(window, "WM_CLASS", &value))
     return false;
 
   return value.find("screensaver") != std::string::npos;
 }
 
 }  // namespace ui