Back out trunk r245028

It seems to have cuased bug 335108 and XP Tests 1 interactive_ui_tests BookmarkBarViewTest18.BookmarkBarViewTest18_SiblingMenu
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds/29747

> aura: Destroy the compositor before destroying the backing window.
> 
> This was causing linux_aura single-process browser tests to crash since
> they don't set up a default X error handler. When the compositor is
> shutting down it does a finish and this might try to swap to the X
> window.
> 
> Also change the windows shutdown ordering to match.
> 
> R=ben, enne
> BUG=270918
> 
> Review URL: https://codereview.chromium.org/132473007

TBR=danakj@chromium.org

Review URL: https://codereview.chromium.org/137893014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245215 0039d316-1c4b-4281-b951-d872f2087c98

ui/aura/window_tree_host.cc

@@ -167,10 +167,7 @@ WindowTreeHost::WindowTreeHost()
     : delegate_(NULL) {
 }
 
-void WindowTreeHost::DestroyCompositor() {
-  DCHECK(GetAcceleratedWidget());
-  compositor_.reset();
-}
+void WindowTreeHost::DestroyCompositor() { compositor_.reset(); }
 
 void WindowTreeHost::CreateCompositor(
     gfx::AcceleratedWidget accelerated_widget) {

ui/gfx/win/window_impl.cc

@@ -260,10 +260,7 @@ LRESULT CALLBACK WindowImpl::WndProc(HWND hwnd,
   if (!window)
     return 0;
 
-  LRESULT result = window->OnWndProc(message, w_param, l_param);
-  if (message == WM_NCDESTROY)
-    window->hwnd_ = NULL;
-  return result;
+  return window->OnWndProc(message, w_param, l_param);
 }
 
 ATOM WindowImpl::GetWindowClassAtom() {

ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

@@ -88,6 +88,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
 }
 
 DesktopWindowTreeHostWin::~DesktopWindowTreeHostWin() {
+  DestroyCompositor();
   // WARNING: |content_window_| has been destroyed by the time we get here.
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(
       root_window_);
@@ -769,10 +770,6 @@ void DesktopWindowTreeHostWin::HandleCreate() {
 void DesktopWindowTreeHostWin::HandleDestroying() {
   drag_drop_client_->OnNativeWidgetDestroying(GetHWND());
   native_widget_delegate_->OnNativeWidgetDestroying();
-
-  // Destroy the compositor before destroying the HWND since shutdown
-  // may try to swap to the window.
-  DestroyCompositor();
 }
 
 void DesktopWindowTreeHostWin::HandleDestroyed() {

ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc

@@ -142,6 +142,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
 }
 
 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 @@ void DesktopWindowTreeHostX11::CloseNow() {
   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_);