Makes aura::LayoutManager be destroyed before properties

ui/aura/window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 132 matching lines @@
 
   if (delegate_)
     delegate_->OnWindowDestroyed(this);
   base::ObserverListBase<WindowObserver>::Iterator iter(&observers_);
   for (WindowObserver* observer = iter.GetNext(); observer;
        observer = iter.GetNext()) {
     RemoveObserver(observer);
     observer->OnWindowDestroyed(this);
   }
 
+  // Delete the LayoutManager before properties. This way if the LayoutManager
+  // depends upon properties existing the properties are still valid.
+  layout_manager_.reset();
+
   // Clear properties.
   for (std::map<const void*, Value>::const_iterator iter = prop_map_.begin();
        iter != prop_map_.end();
        ++iter) {
     if (iter->second.deallocator)
       (*iter->second.deallocator)(iter->second.value);
   }
   prop_map_.clear();
 
   // The layer will either be destroyed by |layer_owner_|'s dtor, or by whoever
@@ skipping 948 matching lines @@
     layer_name = "Unnamed Window";
 
   if (id_ != -1)
     layer_name += " " + base::IntToString(id_);
 
   layer()->set_name(layer_name);
 #endif
 }
 
 }  // namespace aura