| Index: chromeos/network/onc/onc_signature.cc
|
| diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
|
| index b0e96563465b60d76d3ed7c0e094cea23ba8e9ea..44edc31df5fb423fed880051fce1d73a7ad93570 100644
|
| --- a/chromeos/network/onc/onc_signature.cc
|
| +++ b/chromeos/network/onc/onc_signature.cc
|
| @@ -14,25 +14,25 @@ namespace onc {
|
| namespace {
|
|
|
| const OncValueSignature kBoolSignature = {
|
| - Value::TYPE_BOOLEAN, NULL
|
| + base::Value::TYPE_BOOLEAN, NULL
|
| };
|
| const OncValueSignature kStringSignature = {
|
| - Value::TYPE_STRING, NULL
|
| + base::Value::TYPE_STRING, NULL
|
| };
|
| const OncValueSignature kIntegerSignature = {
|
| - Value::TYPE_INTEGER, NULL
|
| + base::Value::TYPE_INTEGER, NULL
|
| };
|
| const OncValueSignature kStringListSignature = {
|
| - Value::TYPE_LIST, NULL, &kStringSignature
|
| + base::Value::TYPE_LIST, NULL, &kStringSignature
|
| };
|
| const OncValueSignature kIntegerListSignature = {
|
| - Value::TYPE_LIST, NULL, &kIntegerSignature
|
| + base::Value::TYPE_LIST, NULL, &kIntegerSignature
|
| };
|
| const OncValueSignature kIPConfigListSignature = {
|
| - Value::TYPE_LIST, NULL, &kIPConfigSignature
|
| + base::Value::TYPE_LIST, NULL, &kIPConfigSignature
|
| };
|
| const OncValueSignature kCellularApnListSignature = {
|
| - Value::TYPE_LIST, NULL, &kCellularApnSignature
|
| + base::Value::TYPE_LIST, NULL, &kCellularApnSignature
|
| };
|
|
|
| const OncFieldSignature issuer_subject_pattern_fields[] = {
|
| @@ -310,88 +310,89 @@ const OncFieldSignature toplevel_configuration_fields[] = {
|
| } // namespace
|
|
|
| const OncValueSignature kRecommendedSignature = {
|
| - Value::TYPE_LIST, NULL, &kStringSignature
|
| + base::Value::TYPE_LIST, NULL, &kStringSignature
|
| };
|
| const OncValueSignature kEAPSignature = {
|
| - Value::TYPE_DICTIONARY, eap_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, eap_fields, NULL
|
| };
|
| const OncValueSignature kIssuerSubjectPatternSignature = {
|
| - Value::TYPE_DICTIONARY, issuer_subject_pattern_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, issuer_subject_pattern_fields, NULL
|
| };
|
| const OncValueSignature kCertificatePatternSignature = {
|
| - Value::TYPE_DICTIONARY, certificate_pattern_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, certificate_pattern_fields, NULL
|
| };
|
| const OncValueSignature kIPsecSignature = {
|
| - Value::TYPE_DICTIONARY, ipsec_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, ipsec_fields, NULL
|
| };
|
| const OncValueSignature kL2TPSignature = {
|
| - Value::TYPE_DICTIONARY, l2tp_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, l2tp_fields, NULL
|
| };
|
| const OncValueSignature kOpenVPNSignature = {
|
| - Value::TYPE_DICTIONARY, openvpn_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, openvpn_fields, NULL
|
| };
|
| const OncValueSignature kVerifyX509Signature = {
|
| - Value::TYPE_DICTIONARY, verify_x509_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, verify_x509_fields, NULL
|
| };
|
| const OncValueSignature kVPNSignature = {
|
| - Value::TYPE_DICTIONARY, vpn_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, vpn_fields, NULL
|
| };
|
| const OncValueSignature kEthernetSignature = {
|
| - Value::TYPE_DICTIONARY, ethernet_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, ethernet_fields, NULL
|
| };
|
| const OncValueSignature kIPConfigSignature = {
|
| - Value::TYPE_DICTIONARY, ipconfig_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, ipconfig_fields, NULL
|
| };
|
| const OncValueSignature kProxyLocationSignature = {
|
| - Value::TYPE_DICTIONARY, proxy_location_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, proxy_location_fields, NULL
|
| };
|
| const OncValueSignature kProxyManualSignature = {
|
| - Value::TYPE_DICTIONARY, proxy_manual_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, proxy_manual_fields, NULL
|
| };
|
| const OncValueSignature kProxySettingsSignature = {
|
| - Value::TYPE_DICTIONARY, proxy_settings_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, proxy_settings_fields, NULL
|
| };
|
| const OncValueSignature kWiFiSignature = {
|
| - Value::TYPE_DICTIONARY, wifi_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, wifi_fields, NULL
|
| };
|
| const OncValueSignature kCertificateSignature = {
|
| - Value::TYPE_DICTIONARY, certificate_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, certificate_fields, NULL
|
| };
|
| const OncValueSignature kNetworkConfigurationSignature = {
|
| - Value::TYPE_DICTIONARY, network_configuration_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, network_configuration_fields, NULL
|
| };
|
| const OncValueSignature kGlobalNetworkConfigurationSignature = {
|
| - Value::TYPE_DICTIONARY, global_network_configuration_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, global_network_configuration_fields, NULL
|
| };
|
| const OncValueSignature kCertificateListSignature = {
|
| - Value::TYPE_LIST, NULL, &kCertificateSignature
|
| + base::Value::TYPE_LIST, NULL, &kCertificateSignature
|
| };
|
| const OncValueSignature kNetworkConfigurationListSignature = {
|
| - Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature
|
| + base::Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature
|
| };
|
| const OncValueSignature kToplevelConfigurationSignature = {
|
| - Value::TYPE_DICTIONARY, toplevel_configuration_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, toplevel_configuration_fields, NULL
|
| };
|
|
|
| // Derived "ONC with State" signatures.
|
| const OncValueSignature kNetworkWithStateSignature = {
|
| - Value::TYPE_DICTIONARY, network_with_state_fields, NULL,
|
| + base::Value::TYPE_DICTIONARY, network_with_state_fields, NULL,
|
| &kNetworkConfigurationSignature
|
| };
|
| const OncValueSignature kWiFiWithStateSignature = {
|
| - Value::TYPE_DICTIONARY, wifi_with_state_fields, NULL, &kWiFiSignature
|
| + base::Value::TYPE_DICTIONARY, wifi_with_state_fields, NULL, &kWiFiSignature
|
| };
|
| const OncValueSignature kCellularSignature = {
|
| - Value::TYPE_DICTIONARY, cellular_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, cellular_fields, NULL
|
| };
|
| const OncValueSignature kCellularWithStateSignature = {
|
| - Value::TYPE_DICTIONARY, cellular_with_state_fields, NULL, &kCellularSignature
|
| + base::Value::TYPE_DICTIONARY, cellular_with_state_fields, NULL,
|
| + &kCellularSignature
|
| };
|
| const OncValueSignature kCellularProviderSignature = {
|
| - Value::TYPE_DICTIONARY, cellular_provider_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, cellular_provider_fields, NULL
|
| };
|
| const OncValueSignature kCellularApnSignature = {
|
| - Value::TYPE_DICTIONARY, cellular_apn_fields, NULL
|
| + base::Value::TYPE_DICTIONARY, cellular_apn_fields, NULL
|
| };
|
|
|
| const OncFieldSignature* GetFieldSignature(const OncValueSignature& signature,
|
|
|