x11: Use gfx::XScopedPtr<> in more places.

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index 8f00d3c6738ecbd56fcb4d50d14b693a8dfa491c..94d4b1ba2f2a480ba90bcf89f8f77d58a0114d7f 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -7,6 +7,7 @@
 
 #include <X11/extensions/shape.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
@@ -321,7 +322,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
   ObserverList<DesktopWindowTreeHostObserverX11> observer_list_;
 
   // The window shape if the window is non-rectangular.
-  ::Region window_shape_;
+  gfx::XScopedPtr<_XRegion, gfx::XObjectDeleter<_XRegion, int, XDestroyRegion>>
+      window_shape_;
 
   // Whether |window_shape_| was set via SetShape().
   bool custom_window_shape_;