Make sure WindowObservers are removed from window before destruction

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 <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 149 matching lines @@
   // Destroy transient children, only after we've removed ourselves from our
   // parent, as destroying an active transient child may otherwise attempt to
   // refocus us.
   Windows transient_children(transient_children_);
   STLDeleteElements(&transient_children);
   DCHECK(transient_children_.empty());
 
   // Delegate and observers need to be notified after transients are deleted.
   if (delegate_)
     delegate_->OnWindowDestroyed();
-  FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowDestroyed(this));
+  ObserverListBase<WindowObserver>::Iterator iter(observers_);
+  WindowObserver* observer;
+  while ((observer = iter.GetNext())) {
+    RemoveObserver(observer);
+    observer->OnWindowDestroyed(this);
+  }
 
   // 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();
 
@@ skipping 1202 matching lines @@
   for (const aura::Window* window = this; window; window = window->parent()) {
     if (window->layer_)
       return window;
     *offset += window->bounds().OffsetFromOrigin();
   }
   *offset = gfx::Vector2d();
   return NULL;
 }
 
 }  // namespace aura