Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(652)

Unified Diff: ui/views/mus/views_mus_test_suite.cc

Issue 1998543004: Fixes crash in ~ShellConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/mus/display_list_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/views_mus_test_suite.cc
diff --git a/ui/views/mus/views_mus_test_suite.cc b/ui/views/mus/views_mus_test_suite.cc
index 2919115d6796744b581734dabc374f0ca27577ea..a101f3b19bef576c91b5c37fad082457769c67e7 100644
--- a/ui/views/mus/views_mus_test_suite.cc
+++ b/ui/views/mus/views_mus_test_suite.cc
@@ -85,7 +85,8 @@ class ShellConnection {
}
~ShellConnection() {
- views::WindowManagerConnection::Reset();
+ if (views::WindowManagerConnection::Exists())
+ views::WindowManagerConnection::Reset();
base::WaitableEvent wait(false, false);
thread_.task_runner()->PostTask(
FROM_HERE, base::Bind(&ShellConnection::TearDownConnections,
« no previous file with comments | « ui/views/mus/display_list_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698