Index: chrome/browser/chromeos/network_settings/onc_signature.cc |
diff --git a/chrome/browser/chromeos/network_settings/onc_signature.cc b/chrome/browser/chromeos/network_settings/onc_signature.cc |
index ee8cf524c6b92c8a01b8a8a90678dfd0194fd389..bba8e424aeba9eac3f31816151c1a75ded5ee755 100644 |
--- a/chrome/browser/chromeos/network_settings/onc_signature.cc |
+++ b/chrome/browser/chromeos/network_settings/onc_signature.cc |
@@ -28,12 +28,6 @@ const OncValueSignature kStringListSignature = { |
const OncValueSignature kIPConfigListSignature = { |
Value::TYPE_LIST, NULL, &kIPConfigSignature |
}; |
-const OncValueSignature kCertificateListSignature = { |
- Value::TYPE_LIST, NULL, &kCertificateSignature |
-}; |
-const OncValueSignature kNetworkConfigurationListSignature = { |
- Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature |
-}; |
const OncFieldSignature issuer_subject_pattern_fields[] = { |
{ certificate::kCommonName, NULL, &kStringSignature }, |
@@ -236,7 +230,7 @@ const OncFieldSignature certificate_fields[] = { |
{ NULL } |
}; |
-const OncFieldSignature unencrypted_configuration_fields[] = { |
+const OncFieldSignature toplevel_configuration_fields[] = { |
{ kCertificates, NULL, &kCertificateListSignature }, |
{ kNetworkConfigurations, NULL, &kNetworkConfigurationListSignature }, |
{ kType, NULL, &kStringSignature }, |
@@ -293,8 +287,14 @@ const OncValueSignature kCertificateSignature = { |
const OncValueSignature kNetworkConfigurationSignature = { |
Value::TYPE_DICTIONARY, network_configuration_fields, NULL |
}; |
-const OncValueSignature kUnencryptedConfigurationSignature = { |
- Value::TYPE_DICTIONARY, unencrypted_configuration_fields, NULL |
+const OncValueSignature kCertificateListSignature = { |
+ Value::TYPE_LIST, NULL, &kCertificateSignature |
+}; |
+const OncValueSignature kNetworkConfigurationListSignature = { |
+ Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature |
+}; |
+const OncValueSignature kToplevelConfigurationSignature = { |
+ Value::TYPE_DICTIONARY, toplevel_configuration_fields, NULL |
}; |
const OncFieldSignature* GetFieldSignature(const OncValueSignature& signature, |