Move ui::GetAtom to gfx::GetAtom

ui/base/x/selection_requestor_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 "ui/base/x/selection_requestor.h"
 
 #include <stddef.h>
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/platform/platform_event_source.h"
+#include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 
 #include <X11/Xlib.h>
 
 namespace ui {
 
 class SelectionRequestorTest : public testing::Test {
  public:
   SelectionRequestorTest() : x_display_(gfx::GetXDisplay()), x_window_(None) {}
 
   ~SelectionRequestorTest() override {}
 
   // Responds to the SelectionRequestor's XConvertSelection() request by
   // - Setting the property passed into the XConvertSelection() request to
   //   |value|.
   // - Sending a SelectionNotify event.
   void SendSelectionNotify(XAtom selection,
                            XAtom target,
                            const std::string& value) {
-    ui::SetStringProperty(x_window_, requestor_->x_property_, GetAtom("STRING"),
-                          value);
+    ui::SetStringProperty(x_window_, requestor_->x_property_,
+                          gfx::GetAtom("STRING"), value);
 
     XEvent xev;
     xev.type = SelectionNotify;
     xev.xselection.serial = 0u;
     xev.xselection.display = x_display_;
     xev.xselection.requestor = x_window_;
     xev.xselection.selection = selection;
     xev.xselection.target = target;
     xev.xselection.property = requestor_->x_property_;
     xev.xselection.time = CurrentTime;
@@ skipping 50 matching lines @@
                                      XAtom selection,
                                      XAtom target,
                                      const std::string& expected_data) {
   scoped_refptr<base::RefCountedMemory> out_data;
   size_t out_data_items = 0u;
   XAtom out_type = None;
   EXPECT_TRUE(requestor->PerformBlockingConvertSelection(
       selection, target, &out_data, &out_data_items, &out_type));
   EXPECT_EQ(expected_data, ui::RefCountedMemoryToString(out_data));
   EXPECT_EQ(expected_data.size(), out_data_items);
-  EXPECT_EQ(GetAtom("STRING"), out_type);
+  EXPECT_EQ(gfx::GetAtom("STRING"), out_type);
 }
 
 }  // namespace
 
 // Test that SelectionRequestor correctly handles receiving a request while it
 // is processing another request.
 TEST_F(SelectionRequestorTest, NestedRequests) {
   // Assume that |selection| will have no owner. If there is an owner, the owner
   // will set the property passed into the XConvertSelection() request which is
   // undesirable.
-  XAtom selection = GetAtom("FAKE_SELECTION");
+  XAtom selection = gfx::GetAtom("FAKE_SELECTION");
 
-  XAtom target1 = GetAtom("TARGET1");
-  XAtom target2 = GetAtom("TARGET2");
+  XAtom target1 = gfx::GetAtom("TARGET1");
+  XAtom target2 = gfx::GetAtom("TARGET2");
 
   base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
   loop->task_runner()->PostTask(
       FROM_HERE, base::Bind(&PerformBlockingConvertSelection,
                             base::Unretained(requestor_.get()), selection,
                             target2, "Data2"));
   loop->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&SelectionRequestorTest::SendSelectionNotify,
                  base::Unretained(this), selection, target1, "Data1"));
   loop->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&SelectionRequestorTest::SendSelectionNotify,
                  base::Unretained(this), selection, target2, "Data2"));
   PerformBlockingConvertSelection(requestor_.get(), selection, target1,
                                   "Data1");
 }
 
 }  // namespace ui