Separating ONC<->Shill translation from the ONC signature.

chromeos/network/onc/onc_signature.h

Index: chromeos/network/onc/onc_signature.h
diff --git a/chromeos/network/onc/onc_signature.h b/chromeos/network/onc/onc_signature.h
index ee637feaa798f643036b5b51e5fbe457baf4e80b..c321e8ff7a86d76daa2f91668b88bcc624d42a13 100644
--- a/chromeos/network/onc/onc_signature.h
+++ b/chromeos/network/onc/onc_signature.h
@@ -17,7 +17,6 @@ struct OncValueSignature;
 
 struct OncFieldSignature {
   const char* onc_field_name;
-  const char* shill_property_name;
   const OncValueSignature* value_signature;
 };
 
@@ -25,6 +24,7 @@ struct CHROMEOS_EXPORT OncValueSignature {
   base::Value::Type onc_type;
   const OncFieldSignature* fields;
   const OncValueSignature* onc_array_entry_signature;
+  const OncValueSignature* base_signature;
 };
 
 CHROMEOS_EXPORT const OncFieldSignature* GetFieldSignature(
@@ -45,7 +45,6 @@ CHROMEOS_EXPORT extern const OncValueSignature kProxyLocationSignature;
 CHROMEOS_EXPORT extern const OncValueSignature kProxyManualSignature;
 CHROMEOS_EXPORT extern const OncValueSignature kProxySettingsSignature;
 CHROMEOS_EXPORT extern const OncValueSignature kWiFiSignature;
-CHROMEOS_EXPORT extern const OncValueSignature kCellularSignature;
 CHROMEOS_EXPORT extern const OncValueSignature kCertificateSignature;
 CHROMEOS_EXPORT extern const OncValueSignature kNetworkConfigurationSignature;
 CHROMEOS_EXPORT extern const OncValueSignature kCertificateListSignature;
@@ -53,6 +52,11 @@ CHROMEOS_EXPORT extern const OncValueSignature
     kNetworkConfigurationListSignature;
 CHROMEOS_EXPORT extern const OncValueSignature kToplevelConfigurationSignature;
 
+// Derived "ONC with State" signatures.
+CHROMEOS_EXPORT extern const OncValueSignature kNetworkWithStateSignature;
+CHROMEOS_EXPORT extern const OncValueSignature kWiFiWithStateSignature;
+CHROMEOS_EXPORT extern const OncValueSignature kCellularWithStateSignature;
+
 }  // namespace onc
 }  // namespace chromeos