Remove usages of XInternAtom

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc

 // Copyright 2014 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 <map>
 #include <memory>
 #include <vector>
 
 // Include views_test_base.h first because the definition of None in X.h
 // conflicts with the definition of None in gtest-type-util.h
 #include "ui/views/test/views_test_base.h"
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/event_utils.h"
-#include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/x11_move_loop.h"
 #include "ui/views/widget/widget.h"
 
 #include <X11/Xlib.h>
 
 namespace views {
 
 namespace {
 
-const char* kAtomsToCache[] = {
-  "XdndActionCopy",
-  "XdndDrop",
-  "XdndEnter",
-  "XdndFinished",
-  "XdndLeave",
-  "XdndPosition",
-  "XdndStatus",
-  "XdndTypeList",
-  NULL
-};
-
 class TestDragDropClient;
 
 // Collects messages which would otherwise be sent to |xid_| via
 // SendXClientEvent().
 class ClientMessageEventCollector {
  public:
   ClientMessageEventCollector(::Window xid, TestDragDropClient* client);
   virtual ~ClientMessageEventCollector();
 
   // Returns true if |events_| is non-empty.
@@ skipping 125 matching lines @@
   // DesktopDragDropClientAuraX11:
   void SendXClientEvent(::Window xid, XEvent* event) override;
 
   // The XID of the window which initiated the drag.
   ::Window source_xid_;
 
   // Map of ::Windows to the collector which intercepts XClientMessageEvents
   // for that window.
   std::map< ::Window, ClientMessageEventCollector*> collectors_;
 
-  ui::X11AtomCache atom_cache_;
-
   DISALLOW_COPY_AND_ASSIGN(TestDragDropClient);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // ClientMessageEventCollector
 
 ClientMessageEventCollector::ClientMessageEventCollector(
     ::Window xid,
     TestDragDropClient* client)
     : xid_(xid),
@@ skipping 93 matching lines @@
 // static
 const int TestDragDropClient::kMouseMoveX = 100;
 
 // static
 const int TestDragDropClient::kMouseMoveY = 200;
 
 TestDragDropClient::TestDragDropClient(
     aura::Window* window,
     DesktopNativeCursorManager* cursor_manager)
     : SimpleTestDragDropClient(window, cursor_manager),
-      source_xid_(window->GetHost()->GetAcceleratedWidget()),
-      atom_cache_(gfx::GetXDisplay(), kAtomsToCache) {
-}
+      source_xid_(window->GetHost()->GetAcceleratedWidget()) {}
 
 TestDragDropClient::~TestDragDropClient() {
 }
 
 Atom TestDragDropClient::GetAtom(const char* name) {
-  return atom_cache_.GetAtom(name);
+  return ui::GetAtom(name);
 }
 
 bool TestDragDropClient::MessageHasType(const XClientMessageEvent& event,
                                         const char* type) {
-  return event.message_type == atom_cache_.GetAtom(type);
+  return event.message_type == GetAtom(type);
 }
 
 void TestDragDropClient::SetEventCollectorFor(
     ::Window xid,
     ClientMessageEventCollector* collector) {
   if (collector)
     collectors_[xid] = collector;
   else
     collectors_.erase(xid);
 }
 
 void TestDragDropClient::OnStatus(XID target_window,
                                   bool will_accept_drop,
                                   ::Atom accepted_action) {
   XClientMessageEvent event;
-  event.message_type = atom_cache_.GetAtom("XdndStatus");
+  event.message_type = GetAtom("XdndStatus");
   event.format = 32;
   event.window = source_xid_;
   event.data.l[0] = target_window;
   event.data.l[1] = will_accept_drop ? 1 : 0;
   event.data.l[2] = 0;
   event.data.l[3] = 0;
   event.data.l[4] = accepted_action;
   OnXdndStatus(event);
 }
 
 void TestDragDropClient::OnFinished(XID target_window,
                                     bool accepted_drop,
                                     ::Atom performed_action) {
   XClientMessageEvent event;
-  event.message_type = atom_cache_.GetAtom("XdndFinished");
+  event.message_type = GetAtom("XdndFinished");
   event.format = 32;
   event.window = source_xid_;
   event.data.l[0] = target_window;
   event.data.l[1] = accepted_drop ? 1 : 0;
   event.data.l[2] = performed_action;
   event.data.l[3] = 0;
   event.data.l[4] = 0;
   OnXdndFinished(event);
 }
 
@@ skipping 631 matching lines @@
 // the aura::client::DragDropDelegate is properly notified.
 TEST_F(DesktopDragDropClientAuraX11ChromeSourceTargetTest, CtrlPressed) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&ChromeSourceTargetStep2, client(), ui::EF_CONTROL_DOWN));
   int result = StartDragAndDrop();
   EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, result);
 }
 
 }  // namespace views