Index: ui/views/widget/native_widget_mac_unittest.mm |
diff --git a/ui/views/widget/native_widget_mac_unittest.mm b/ui/views/widget/native_widget_mac_unittest.mm |
index 0dec9ded50095c597488f9b4f621fe55f2e16cf5..85d7ec30ce630febc6aa7e13dd5f076adefcb3c6 100644 |
--- a/ui/views/widget/native_widget_mac_unittest.mm |
+++ b/ui/views/widget/native_widget_mac_unittest.mm |
@@ -1154,9 +1154,18 @@ class ParentCloseMonitor : public WidgetObserver { |
} |
void OnWidgetDestroying(Widget* child) override { |
- // Upon a parent-triggered close, the NSWindow relationship will already be |
- // removed. The parent should still be open (children are always closed |
- // first), but not have a delegate (since it is being torn down). |
+ // Upon a parent-triggered close, the NSWindow relationship will still exist |
+ // (it's removed just after OnWidgetDestroying() returns). The parent should |
+ // still be open (children are always closed first), but not have a delegate |
+ // (since it is being torn down). |
+ EXPECT_TRUE([child->GetNativeWindow() parentWindow]); |
+ EXPECT_TRUE([parent_nswindow_ isVisible]); |
+ EXPECT_FALSE([parent_nswindow_ delegate]); |
+ |
+ EXPECT_FALSE(child_closed_); |
+ } |
+ |
+ void OnWidgetDestroyed(Widget* child) override { |
EXPECT_FALSE([child->GetNativeWindow() parentWindow]); |
EXPECT_TRUE([parent_nswindow_ isVisible]); |
EXPECT_FALSE([parent_nswindow_ delegate]); |