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

Unified Diff: ash/mus/window_manager_application.cc

Issue 2772513003: Makes AshTestHelper shutdown ChromeOS NetworkHandler (Closed)
Patch Set: 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/shelf/shelf_view_unittest.cc » ('j') | ash/test/ash_test_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index c3dbcf58f3767b43a26762b77312395bebfe22a1..fe65aefd520c5bc61b5abd56fcf11a74bf3cc39b 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -99,7 +99,9 @@ void WindowManagerApplication::ShutdownComponents() {
chromeos::CrasAudioHandler::Shutdown();
chromeos::NetworkConnect::Shutdown();
network_connect_delegate_.reset();
- chromeos::NetworkHandler::Shutdown();
+ // Tests may explicitly shutdown the NetworkHandler.
+ if (chromeos::NetworkHandler::IsInitialized())
+ chromeos::NetworkHandler::Shutdown();
device::BluetoothAdapterFactory::Shutdown();
bluez::BluezDBusManager::Shutdown();
chromeos::DBusThreadManager::Shutdown();
« no previous file with comments | « no previous file | ash/shelf/shelf_view_unittest.cc » ('j') | ash/test/ash_test_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698