Index: chrome/browser/chromeos/policy/network_configuration_updater.cc |
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater.cc b/chrome/browser/chromeos/policy/network_configuration_updater.cc |
index d4f29c22edb758af450918a0ce9f3e32019fafe6..ae998cd9587c2a4bb8b611d9bf4e3a62dbe6e44a 100644 |
--- a/chrome/browser/chromeos/policy/network_configuration_updater.cc |
+++ b/chrome/browser/chromeos/policy/network_configuration_updater.cc |
@@ -91,9 +91,12 @@ void NetworkConfigurationUpdater::ImportCertificates( |
} |
void NetworkConfigurationUpdater::ApplyNetworkPolicy( |
- base::ListValue* network_configs_onc) { |
- network_config_handler_->SetPolicy( |
- onc_source_, std::string() /* no username hash */, *network_configs_onc); |
+ base::ListValue* network_configs_onc, |
+ base::DictionaryValue* global_network_config) { |
+ network_config_handler_->SetPolicy(onc_source_, |
+ std::string() /* no username hash */, |
+ *network_configs_onc, |
+ *global_network_config); |
} |
void NetworkConfigurationUpdater::OnPolicyChanged( |
@@ -115,15 +118,17 @@ void NetworkConfigurationUpdater::ApplyPolicy() { |
LOG(ERROR) << LogHeader() << " is not a string value."; |
base::ListValue network_configs; |
+ base::DictionaryValue global_network_config; |
base::ListValue certificates; |
chromeos::onc::ParseAndValidateOncForImport(onc_blob, |
onc_source_, |
"" /* no passphrase */, |
&network_configs, |
+ &global_network_config, |
&certificates); |
ImportCertificates(certificates); |
- ApplyNetworkPolicy(&network_configs); |
+ ApplyNetworkPolicy(&network_configs, &global_network_config); |
} |
std::string NetworkConfigurationUpdater::LogHeader() const { |