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

Unified Diff: services/ui/test_wm/test_wm.cc

Issue 2682793003: aura-mus: Destroy the capture client before the tree client in TestWM. (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/test_wm/test_wm.cc
diff --git a/services/ui/test_wm/test_wm.cc b/services/ui/test_wm/test_wm.cc
index d9e2c9eb3bc1aedadccae32d17826513c3c1612a..a0c75dbe1806e147459979a62f5c376345e78a4f 100644
--- a/services/ui/test_wm/test_wm.cc
+++ b/services/ui/test_wm/test_wm.cc
@@ -39,6 +39,8 @@ class TestWM : public service_manager::Service,
TestWM() {}
~TestWM() override {
+ default_capture_client_.reset();
+
// WindowTreeHost uses state from WindowTreeClient, so destroy it first.
window_tree_host_.reset();
@@ -147,6 +149,7 @@ class TestWM : public service_manager::Service,
void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override {
DCHECK_EQ(window_tree_host, window_tree_host_.get());
root_ = nullptr;
+ default_capture_client_.reset();
window_tree_host_.reset();
}
void OnWmDisplayModified(const display::Display& display) override {}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698