Move ui::GetAtom to gfx::GetAtom

ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.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 "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
 
 // Clean up X11 header polution
 #undef None
 #undef Bool
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/dragdrop/file_info.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/events/platform/x11/x11_event_source_glib.h"
+#include "ui/gfx/x/x11_atom_cache.h"
 #include "url/gurl.h"
 
 const char kFileURL[] = "file:///home/user/file.txt";
 const char kFileName[] = "/home/user/file.txt";
 const char kGoogleTitle[] = "Google";
 const char kGoogleURL[] = "http://www.google.com/";
 
 namespace ui {
 
 class OSExchangeDataProviderAuraX11Test : public testing::Test {
  public:
   OSExchangeDataProviderAuraX11Test() : event_source(gfx::GetXDisplay()) {}
 
   void AddURLList(const std::string& list_contents) {
     std::string contents_copy = list_contents;
     scoped_refptr<base::RefCountedMemory> mem(
         base::RefCountedString::TakeString(&contents_copy));
 
-    provider.format_map_.Insert(GetAtom(ui::Clipboard::kMimeTypeURIList), mem);
+    provider.format_map_.Insert(gfx::GetAtom(ui::Clipboard::kMimeTypeURIList),
+                                mem);
   }
 
  protected:
   base::MessageLoopForUI message_loop;
   X11EventSourceGlib event_source;
   ui::OSExchangeDataProviderAuraX11 provider;
 };
 
 TEST_F(OSExchangeDataProviderAuraX11Test, MozillaURL) {
   // Check that we can get titled entries.
@@ skipping 71 matching lines @@
   AddURLList(kFileURL);
 
   EXPECT_FALSE(provider.HasString());
   base::string16 out_str;
   EXPECT_FALSE(provider.GetString(&out_str));
 
   EXPECT_TRUE(provider.HasFile());
 }
 
 }  // namespace ui