| 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 7563c7fcdb147e8e618a3a6af9d1a84ee64c1502..b11f3ad98334e597208fb1c7b7b3cf61d0c14b20 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -283,11 +283,8 @@ class DBusServices {
|
| chromeos::GeolocationHandler::Initialize();
|
| chromeos::NetworkStateHandler::Initialize();
|
|
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - chromeos::switches::kEnableNewNetworkConfigurationHandlers)) {
|
| - chromeos::NetworkConfigurationHandler::Initialize();
|
| - chromeos::ManagedNetworkConfigurationHandler::Initialize();
|
| - }
|
| + chromeos::NetworkConfigurationHandler::Initialize();
|
| + chromeos::ManagedNetworkConfigurationHandler::Initialize();
|
|
|
| // Initialize the network change notifier for Chrome OS. The network
|
| // change notifier starts to monitor changes from the power manager and
|
| @@ -325,11 +322,8 @@ class DBusServices {
|
| if (cros_initialized_ && CrosLibrary::Get())
|
| CrosLibrary::Shutdown();
|
|
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - chromeos::switches::kEnableNewNetworkConfigurationHandlers)) {
|
| - chromeos::ManagedNetworkConfigurationHandler::Shutdown();
|
| - chromeos::NetworkConfigurationHandler::Shutdown();
|
| - }
|
| + chromeos::ManagedNetworkConfigurationHandler::Shutdown();
|
| + chromeos::NetworkConfigurationHandler::Shutdown();
|
|
|
| chromeos::ConnectivityStateHelper::Shutdown();
|
| chromeos::NetworkStateHandler::Shutdown();
|
|
|