Move ui::GetAtom to gfx::GetAtom

ui/aura/test/ui_controls_factory_aurax11.cc

 // Copyright 2013 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 <X11/keysym.h>
 #include <X11/Xlib.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/test/ui_controls_factory_aura.h"
 #include "ui/aura/test/x11_event_sender.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/test/ui_controls_aura.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/events/test/platform_event_waiter.h"
+#include "ui/gfx/x/x11_atom_cache.h"
 
 namespace aura {
 namespace test {
 namespace {
 
 using ui_controls::DOWN;
 using ui_controls::LEFT;
 using ui_controls::MIDDLE;
 using ui_controls::MouseButton;
 using ui_controls::RIGHT;
 using ui_controls::UIControlsAura;
 using ui_controls::UP;
 
 // Mask of the buttons currently down.
 unsigned button_down_mask = 0;
 
 // Returns atom that indidates that the XEvent is marker event.
 Atom MarkerEventAtom() {
-  return ui::GetAtom("marker_event");
+  return gfx::GetAtom("marker_event");
 }
 
 // Returns true when the event is a marker event.
 bool Matcher(const base::NativeEvent& event) {
   return event->xany.type == ClientMessage &&
       event->xclient.message_type == MarkerEventAtom();
 }
 
 class UIControlsX11 : public UIControlsAura {
  public:
@@ skipping 172 matching lines @@
 };
 
 }  // namespace
 
 UIControlsAura* CreateUIControlsAura(WindowTreeHost* host) {
   return new UIControlsX11(host);
 }
 
 }  // namespace test
 }  // namespace aura