3 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 85a21c4..ef85d68 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -117,10 +117,12 @@ void BrowserPolicyConnector::Init() {
 #if defined(OS_CHROMEOS)
   InitializeDevicePolicy();
 
-  network_configuration_updater_.reset(
-      new NetworkConfigurationUpdater(
-          managed_cloud_provider_.get(),
-          chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableONCPolicy)) {
+    network_configuration_updater_.reset(
+        new NetworkConfigurationUpdater(
+            managed_cloud_provider_.get(),
+            chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
+  }
 #endif
 }
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9fc7528..c56cfe2 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1135,6 +1135,9 @@ const char kEnableLoginImages[]             = "enable-login-images";
 // Enables mobile setup in a dialog.
 const char kEnableMobileSetupDialog[]       = "enable-mobile-dialog";
 
+// Enables support for policy-configured networks.
+const char kEnableONCPolicy[]               = "enable-onc-policy";
+
 // Rotates the screen in response to orientation changed events from dbus. Will
 // be reused for more generic sensors.
 const char kEnableSensors[]                 = "enable-sensors";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index ebce583..307900f 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -311,6 +311,7 @@ extern const char kEnableDevicePolicy[];
 extern const char kEnableGView[];
 extern const char kEnableLoginImages[];
 extern const char kEnableMobileSetupDialog[];
+extern const char kEnableONCPolicy[];
 extern const char kEnableSensors[];
 extern const char kEnableStaticIPConfig[];
 extern const char kLoginManager[];