Index: chrome/test/base/view_event_test_base.cc |
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc |
index 869179fd8cd7565ab48e42770682e1b754d81f8b..0b86478249d5aa3b89e52a313a29cade4038cb21 100644 |
--- a/chrome/test/base/view_event_test_base.cc |
+++ b/chrome/test/base/view_event_test_base.cc |
@@ -31,6 +31,12 @@ class TestView : public views::View { |
} |
void Layout() override { |
+ // Permit a test to remove the view being tested from the hierarchy, then |
+ // still handle a _NET_WM_STATE event on Linux during teardown that triggers |
+ // layout. |
+ if (!has_children()) |
+ return; |
+ |
View* child_view = child_at(0); |
child_view->SetBounds(0, 0, width(), height()); |
} |