Using the new Network*Handlers in networkingPrivate Extension API.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 265 matching lines @@
             content::BrowserThread::FILE));
     disks::DiskMountManager::Initialize();
     cryptohome::AsyncMethodCaller::Initialize();
 
     // Always initialize these handlers which should not conflict with
     // NetworkLibrary.
     chromeos::network_event_log::Initialize();
     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
     // the network manager.
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             chromeos::switches::kEnableNewNetworkChangeNotifier)) {
       NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize();
     } else {
       CrosNetworkChangeNotifierFactory::GetInstance()->Init();
     }
@@ skipping 17 matching lines @@
 
   ~DBusServices() {
     // CrosLibrary is shut down before DBusThreadManager even though it
     // is initialized first becuase some of its libraries depend on DBus
     // clients.
     // TODO(hashimoto): Resolve this situation by removing CrosLibrary.
     // (crosbug.com/26160)
     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();
     chromeos::GeolocationHandler::Shutdown();
     chromeos::network_event_log::Shutdown();
 
     cryptohome::AsyncMethodCaller::Shutdown();
     disks::DiskMountManager::Shutdown();
     input_method::Shutdown();
     CrosDBusService::Shutdown();
@@ skipping 514 matching lines @@
     return;
 
   // If failed to launch, go back to login screen.
   LOG(ERROR) << "Failed to launch kiosk app. Fall back to login screen";
   OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
 
   // TODO(xiyuan): Show error message.
 }
 
 }  //  namespace chromeos