Desktop aura: Put x11 cache in aura, instead of ui/base/x/.

ui/aura/x11_atom_cache.cc

Index: ui/aura/x11_atom_cache.cc
diff --git a/ui/base/x/x11_atom_cache.cc b/ui/aura/x11_atom_cache.cc
similarity index 84%
rename from ui/base/x/x11_atom_cache.cc
rename to ui/aura/x11_atom_cache.cc
index 9f16df83d343b7e791d418d0990f92c240b8d090..750934a930162e0682a5704ef0e71b6e079a163d 100644
--- a/ui/base/x/x11_atom_cache.cc
+++ b/ui/aura/x11_atom_cache.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/x/x11_atom_cache.h"
+#include "ui/aura/x11_atom_cache.h"
 
 #include <X11/Xatom.h>
 
 #include "base/message_pump_x.h"
 
-namespace ui {
+namespace aura {
 
 namespace {
 
 // A list of atoms that we'll intern on host creation to save roundtrips to the
 // X11 server. Must be kept in sync with AtomCache::AtomName
 struct AtomInfo {
-  ui::AtomName id;
+  AtomName id;
   const char* name;
 } const kAtomList[] = {
   { ATOM_WM_DELETE_WINDOW, "WM_DELETE_WINDOW" },
@@ -27,15 +27,10 @@ struct AtomInfo {
 };
 
 // Our lists need to stay in sync here.
-COMPILE_ASSERT(arraysize(kAtomList) == ui::ATOM_COUNT,
-               atom_lists_are_same_size);
+COMPILE_ASSERT(arraysize(kAtomList) == ATOM_COUNT, atom_lists_are_same_size);
 
 }  // namespace
 
-X11AtomCache* X11AtomCache::GetInstance() {
-  return Singleton<X11AtomCache>::get();
-}
-
 ::Atom X11AtomCache::GetAtom(AtomName name) const {
   std::map<AtomName, ::Atom>::const_iterator it = cached_atoms_.find(name);
   DCHECK(it != cached_atoms_.end());
@@ -60,6 +55,4 @@ X11AtomCache::X11AtomCache() {
 
 X11AtomCache::~X11AtomCache() {}
 
-}  // namespace ui
-
-
+}  // namespace aura