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

Unified Diff: ash/mus/test/wm_test_helper.cc

Issue 2105653003: Fixes shutdown race in mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 6 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 | « ash/mus/root_windows_observer.h ('k') | ash/mus/window_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/test/wm_test_helper.cc
diff --git a/ash/mus/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc
index 0fbf42661a7ab1dfefa2673d4edd6448c9e39c27..a14b0381426b0ef44714edf8894c0f8aa40bdb03 100644
--- a/ash/mus/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -24,8 +24,7 @@ WmTestHelper::~WmTestHelper() {}
void WmTestHelper::Init() {
message_loop_.reset(new base::MessageLoopForUI());
- window_manager_app_.window_manager_.reset(
- new WindowManager(&window_manager_app_, nullptr));
+ window_manager_app_.window_manager_.reset(new WindowManager(nullptr));
screen_ = new WmTestScreen;
window_manager_app_.window_manager_->screen_.reset(screen_);
« no previous file with comments | « ash/mus/root_windows_observer.h ('k') | ash/mus/window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698