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

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

Issue 2772513003: Makes AshTestHelper shutdown ChromeOS NetworkHandler (Closed)
Patch Set: comments Created 3 years, 9 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 | ash/mus/window_manager_application.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 faec51654b745bbedf0112fe91c44f4bf12934b4..84e87ac4d53a08f6c804569c1eb80eeba89e5d67 100644
--- a/ash/mus/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -108,9 +108,12 @@ void WmTestHelper::Init() {
window_manager_app_->window_manager_.get());
aura::test::EnvTestHelper().SetWindowTreeClient(
window_tree_client_setup_.window_tree_client());
+ // See comment in AshTestHelper for details on why NetworkHandler is not
+ // initialized.
+ const bool init_network_handler = false;
window_manager_app_->InitWindowManager(
window_tree_client_setup_.OwnWindowTreeClient(),
- blocking_pool_owner_->pool());
+ blocking_pool_owner_->pool(), init_network_handler);
aura::WindowTreeClient* window_tree_client =
window_manager_app_->window_manager()->window_tree_client();
« no previous file with comments | « no previous file | ash/mus/window_manager_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698