Index: ui/aura/test/env_test_helper.h |
diff --git a/ui/aura/test/env_test_helper.h b/ui/aura/test/env_test_helper.h |
index 3f7ee728f2cdcf9676be14f3ba4bc8e550a3804a..4ea50206cf0f642e198edb5bf385c02e0d718f89 100644 |
--- a/ui/aura/test/env_test_helper.h |
+++ b/ui/aura/test/env_test_helper.h |
@@ -42,6 +42,7 @@ class EnvTestHelper { |
// only be used for tests where Env is long lived. |
void SetWindowTreeClient(WindowTreeClient* window_tree_client) { |
env_->window_tree_client_ = window_tree_client; |
+ env_->in_mus_shutdown_ = window_tree_client ? false : true; |
} |
void SetAlwaysUseLastMouseLocation(bool value) { |