Check that child window was not destroyed inside UpdateTransientChildVisibility.

ui/wm/core/transient_window_manager_unittest.cc

 // Copyright 2014 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/wm/core/transient_window_manager.h"
 
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_observer.h"
 #include "ui/wm/core/transient_window_observer.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/core/wm_state.h"
 
 using aura::Window;
 
 using aura::test::ChildWindowIDsAsString;
 using aura::test::CreateTestWindowWithId;
 
 namespace wm {
@@ skipping 16 matching lines @@
     remove_count_++;
   }
 
  private:
   int add_count_;
   int remove_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTransientWindowObserver);
 };
 
+class WindowVisibilityObserver : public aura::WindowObserver {
+ public:
+  WindowVisibilityObserver(Window* observed_window,
+                           scoped_ptr<Window> owned_window)
+      : observed_window_(observed_window), owned_window_(owned_window.Pass()) {
+    observed_window_->AddObserver(this);
+  }
+  ~WindowVisibilityObserver() override {
+    observed_window_->RemoveObserver(this);
+  }
+
+  void OnWindowVisibilityChanged(Window* window, bool visible) override {
+    owned_window_.reset();
+  }
+ private:
+  Window* observed_window_;
+  scoped_ptr<Window> owned_window_;
+};

[oshima, 2015/11/19 18:05:40]

nit: DISALLOW_COPY_AND_ASSIGN

+
 class TransientWindowManagerTest : public aura::test::AuraTestBase {
  public:
   TransientWindowManagerTest() {}
   ~TransientWindowManagerTest() override {}
 
   void SetUp() override {
     AuraTestBase::SetUp();
     wm_state_.reset(new wm::WMState);
   }
 
@@ skipping 248 matching lines @@
 
 // Tests that transient windows are stacked properly when created.
 TEST_F(TransientWindowManagerTest, StackUponCreation) {
   scoped_ptr<Window> window0(CreateTestWindowWithId(0, root_window()));
   scoped_ptr<Window> window1(CreateTestWindowWithId(1, root_window()));
 
   scoped_ptr<Window> window2(CreateTransientChild(2, window0.get()));
   EXPECT_EQ("0 2 1", ChildWindowIDsAsString(root_window()));
 }
 
+// Tests for a crash when window destroyed inside
+// UpdateTransientChildVisibility loop.
+TEST_F(TransientWindowManagerTest, CrashOnVisibilityChange) {
+  scoped_ptr<Window> window1(CreateTransientChild(1, root_window()));
+  scoped_ptr<Window> window2(CreateTransientChild(2, root_window()));
+  window1->Show();
+  window2->Show();
+
+  WindowVisibilityObserver visibility_observer(window1.get(), window2.Pass());
+  root_window()->Hide();
+}
 // Tests that windows are restacked properly after a call to AddTransientChild()
 // or RemoveTransientChild().
 TEST_F(TransientWindowManagerTest, RestackUponAddOrRemoveTransientChild) {
   scoped_ptr<Window> windows[4];
   for (int i = 0; i < 4; i++)
     windows[i].reset(CreateTestWindowWithId(i, root_window()));
   EXPECT_EQ("0 1 2 3", ChildWindowIDsAsString(root_window()));
 
   AddTransientChild(windows[0].get(), windows[2].get());
   EXPECT_EQ("0 2 1 3", ChildWindowIDsAsString(root_window()));
@@ skipping 92 matching lines @@
   EXPECT_EQ(0, test_observer.remove_count());
 
   RemoveTransientChild(parent.get(), w1.get());
   EXPECT_EQ(1, test_observer.add_count());
   EXPECT_EQ(1, test_observer.remove_count());
 
   TransientWindowManager::Get(parent.get())->RemoveObserver(&test_observer);
 }
 
 }  // namespace wm