Adding policy support to the new network configuration stack.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

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 aeefb5b3518a19028d57a51e119ac51f0638b47e..5d0d09ea2366c199a96f42097890fa04e395b2b4 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -54,6 +54,8 @@
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
+#include "chrome/browser/chromeos/policy/network_configuration_updater.h"
+#include "chrome/browser/chromeos/policy/network_configuration_updater2.h"
 #include "chrome/browser/chromeos/power/brightness_observer.h"
 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
 #include "chrome/browser/chromeos/power/power_button_observer.h"
@@ -589,7 +591,12 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
   // configuration before login.
   policy::BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
-  connector->GetNetworkConfigurationUpdater();
+  if (parsed_command_line().HasSwitch(
+          chromeos::switches::kUseNewNetworkConfigurationHandlers)) {
+    connector->GetNetworkConfigurationUpdater2();
+  } else {
+    connector->GetNetworkConfigurationUpdater();
+  }
 
   // Make sure that wallpaper boot transition and other delays in OOBE
   // are disabled for tests by default.