Move ui/base/x/x11_error_tracker to base/x11.

base/x11/x11_error_tracker.h

Index: base/x11/x11_error_tracker.h
diff --git a/ui/base/x/x11_error_tracker.h b/base/x11/x11_error_tracker.h
similarity index 78%
rename from ui/base/x/x11_error_tracker.h
rename to base/x11/x11_error_tracker.h
index 57d46d1b3acfc2450357cbf857322be5b76330ae..f76df8691bdfb32147e9539ee34959b72e2de1a2 100644
--- a/ui/base/x/x11_error_tracker.h
+++ b/base/x11/x11_error_tracker.h
@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef BASE_X11_X11_ERROR_TRACKER_H_
+#define BASE_X11_X11_ERROR_TRACKER_H_
+
 #include <X11/Xlib.h>
 
+#include "base/base_export.h"
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
 
-namespace ui {
+namespace base {
 
 // X11ErrorTracker catches X11 errors in a non-fatal way. It does so by
 // temporarily changing the X11 error handler. The old error handler is
 // restored when the tracker is destroyed.
-class UI_EXPORT X11ErrorTracker {
+class BASE_EXPORT X11ErrorTracker {
  public:
   X11ErrorTracker();
   ~X11ErrorTracker();
@@ -30,4 +33,6 @@ class UI_EXPORT X11ErrorTracker {
   DISALLOW_COPY_AND_ASSIGN(X11ErrorTracker);
 };
 
-}  // namespace ui
+}  // namespace base
+
+#endif  // BASE_X11_X11_ERROR_TRACKER_H_