Back out trunk r245028

trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc

Index: trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
===================================================================
--- trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc	(revision 245213)
+++ trunk/src/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc	(working copy)
@@ -142,6 +142,7 @@
 }
 
 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
+  DestroyCompositor();
   root_window_->window()->ClearProperty(kHostForRootWindow);
   aura::client::SetWindowMoveClient(root_window_->window(), NULL);
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(root_window_);
@@ -319,11 +320,6 @@
   desktop_native_widget_aura_->root_window_event_filter()->RemoveHandler(
       x11_window_event_filter_.get());
 
-  // Destroy the compositor before destroying the |xwindow_| since shutdown
-  // may try to swap, and the swap without a window causes an X error, which
-  // causes a crash with in-process renderer.
-  DestroyCompositor();
-
   open_windows().remove(xwindow_);
   // Actually free our native resources.
   base::MessagePumpX11::Current()->RemoveDispatcherForWindow(xwindow_);