Index: chromeos/network/onc/onc_utils.cc |
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc |
index 75d9e5217768efae09895a77abd75be78bccf628..586907d1c1a6cfd1b9ad8797b5217e8c2027d3a2 100644 |
--- a/chromeos/network/onc/onc_utils.cc |
+++ b/chromeos/network/onc/onc_utils.cc |
@@ -350,9 +350,11 @@ bool ParseAndValidateOncForImport(const std::string& onc_blob, |
ONCSource onc_source, |
const std::string& passphrase, |
base::ListValue* network_configs, |
+ base::DictionaryValue* global_network_config, |
base::ListValue* certificates) { |
- certificates->Clear(); |
network_configs->Clear(); |
+ global_network_config->Clear(); |
+ certificates->Clear(); |
if (onc_blob.empty()) |
return true; |
@@ -433,6 +435,13 @@ bool ParseAndValidateOncForImport(const std::string& onc_blob, |
network_configs->Swap(validated_networks); |
} |
+ base::DictionaryValue* validated_global_config = NULL; |
+ if (toplevel_onc->GetDictionaryWithoutPathExpansion( |
+ toplevel_config::kGlobalNetworkConfiguration, |
+ &validated_global_config)) { |
+ global_network_config->Swap(validated_global_config); |
+ } |
+ |
return success; |
} |