Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index da34978d05a50ed4b954310959e6b873c51195ff..86e638e1f235ccc12455d77bc9a2df60eba52bea 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -88,6 +88,7 @@ |
#include "chromeos/disks/disk_mount_manager.h" |
#include "chromeos/display/output_configurator.h" |
#include "chromeos/network/geolocation_handler.h" |
+#include "chromeos/network/managed_network_configuration_handler.h" |
#include "chromeos/network/network_change_notifier_chromeos.h" |
#include "chromeos/network/network_change_notifier_factory_chromeos.h" |
#include "chromeos/network/network_configuration_handler.h" |
@@ -297,6 +298,7 @@ class DBusServices { |
chromeos::NetworkDeviceHandler::Initialize(); |
chromeos::NetworkStateHandler::Initialize(); |
chromeos::NetworkConfigurationHandler::Initialize(); |
+ chromeos::ManagedNetworkConfigurationHandler::Initialize(); |
// TODO(gauravsh): This needs re-factoring. NetworkChangeNotifier choice |
// needs to be made before about:flags are processed. |
if (use_new_network_change_notifier_) |
@@ -315,6 +317,8 @@ class DBusServices { |
chromeos::ConnectivityStateHelper::Shutdown(); |
if (network_handlers_initialized_) { |
+ chromeos::ManagedNetworkConfigurationHandler::Shutdown(); |
+ chromeos::NetworkConfigurationHandler::Shutdown(); |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
chromeos::switches::kEnableNewNetworkHandlers)) { |
chromeos::NetworkDeviceHandler::Shutdown(); |