Release aura::Desktop event handler windows on detaching an ancestor window.

ui/aura/window_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 119 matching lines @@
   scoped_ptr<Window> w1(CreateTestWindowWithId(1, NULL));
   scoped_ptr<Window> w11(CreateTestWindowWithId(11, w1.get()));
   scoped_ptr<Window> w111(CreateTestWindowWithId(111, w11.get()));
   scoped_ptr<Window> w12(CreateTestWindowWithId(12, w1.get()));
 
   EXPECT_EQ(NULL, w1->GetChildById(57));
   EXPECT_EQ(w12.get(), w1->GetChildById(12));
   EXPECT_EQ(w111.get(), w1->GetChildById(111));
 }
 
+// Make sure that Window::Contains correctly handles children, grandchildren,
+// and not containing NULL or parents.
+TEST_F(WindowTest, Contains) {
+  Window parent(NULL);
+  parent.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
+  Window child1(NULL);
+  child1.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
+  Window child2(NULL);
+  child2.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
+
+  child1.SetParent(&parent);
+  child2.SetParent(&child1);
+
+  EXPECT_TRUE(parent.Contains(&parent));
+  EXPECT_TRUE(parent.Contains(&child1));
+  EXPECT_TRUE(parent.Contains(&child2));
+
+  EXPECT_FALSE(parent.Contains(NULL));
+  EXPECT_FALSE(child1.Contains(&parent));
+  EXPECT_FALSE(child2.Contains(&child1));
+}
+
 TEST_F(WindowTest, ConvertPointToWindow) {
   // Window::ConvertPointToWindow is mostly identical to
   // Layer::ConvertPointToLayer, except NULL values for |source| are permitted,
   // in which case the function just returns.
   scoped_ptr<Window> w1(CreateTestWindowWithId(1, NULL));
   gfx::Point reference_point(100, 100);
   gfx::Point test_point = reference_point;
   Window::ConvertPointToWindow(NULL, w1.get(), &test_point);
   EXPECT_EQ(reference_point, test_point);
 }
@@ skipping 947 matching lines @@
 
   w3->Activate();
   EXPECT_EQ(w2.get(), active());
 
   w1->Activate();
   EXPECT_EQ(w1.get(), active());
 }
 
 }  // namespace test
 }  // namespace aura