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

ui/views/widget/x11_window_event_filter.cc

Index: ui/views/widget/x11_window_event_filter.cc
diff --git a/ui/views/widget/x11_window_event_filter.cc b/ui/views/widget/x11_window_event_filter.cc
index bb10c1bb632de029a383ea12bdba2a0fc9c53547..51065fdc6874b82b04e876f1830d29fd3968e7fe 100644
--- a/ui/views/widget/x11_window_event_filter.cc
+++ b/ui/views/widget/x11_window_event_filter.cc
@@ -8,11 +8,11 @@
 #include <X11/extensions/XInput2.h>
 
 #include "base/message_pump_x.h"
+#include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_delegate.h"
+#include "ui/aura/x11_atom_cache.h"
 #include "ui/base/hit_test.h"
-#include "ui/base/x/x11_atom_cache.h"
-#include "ui/base/x/x11_atom_cache.h"
 
 namespace {
 
@@ -58,13 +58,13 @@ X11WindowEventFilter::X11WindowEventFilter(aura::RootWindow* root_window)
 X11WindowEventFilter::~X11WindowEventFilter() {}
 
 void X11WindowEventFilter::SetUseHostWindowBorders(bool use_os_border) {
-  ui::X11AtomCache* cache = ui::X11AtomCache::GetInstance();
+  aura::X11AtomCache* cache = aura::Env::GetInstance()->atom_cache();
   MotifWmHints motif_hints;
   memset(&motif_hints, 0, sizeof(motif_hints));
   motif_hints.flags = kHintsDecorations;
   motif_hints.decorations = use_os_border ? 1 : 0;
 
-  ::Atom hint_atom = cache->GetAtom(ui::ATOM__MOTIF_WM_HINTS);
+  ::Atom hint_atom = cache->GetAtom(aura::ATOM__MOTIF_WM_HINTS);
   XChangeProperty(base::MessagePumpX::GetDefaultXDisplay(),
                   xwindow_,
                   hint_atom,
@@ -173,8 +173,8 @@ bool X11WindowEventFilter::DispatchHostWindowDragMovement(
   event.xclient.type = ClientMessage;
   event.xclient.display = xdisplay_;
   event.xclient.window = xwindow_;
-  event.xclient.message_type = ui::X11AtomCache::GetInstance()->GetAtom(
-      ui::ATOM__NET_WM_MOVERESIZE);
+  event.xclient.message_type = aura::Env::GetInstance()->atom_cache()->GetAtom(
+          aura::ATOM__NET_WM_MOVERESIZE);
   event.xclient.format = 32;
   event.xclient.data.l[0] = screen_location.x();
   event.xclient.data.l[1] = screen_location.y();