| Index: chromeos/network/onc/onc_validator.cc
|
| diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc
|
| index f596bec329b794b08cdb52943f25a4a673adeaba..5842134ed472e25019321629364f349d77025520 100644
|
| --- a/chromeos/network/onc/onc_validator.cc
|
| +++ b/chromeos/network/onc/onc_validator.cc
|
| @@ -301,9 +301,6 @@ bool Validator::ValidateClientCertFields(bool allow_cert_type_none,
|
| std::string cert_type;
|
| result->GetStringWithoutPathExpansion(kClientCertType, &cert_type);
|
|
|
| - if (IsCertPatternInDevicePolicy(cert_type))
|
| - return false;
|
| -
|
| bool all_required_exist = true;
|
|
|
| if (cert_type == kPattern)
|
| @@ -508,17 +505,6 @@ bool Validator::CheckGuidIsUniqueAndAddToSet(const base::DictionaryValue& dict,
|
| return true;
|
| }
|
|
|
| -bool Validator::IsCertPatternInDevicePolicy(const std::string& cert_type) {
|
| - if (cert_type == ::onc::client_cert::kPattern &&
|
| - onc_source_ == ::onc::ONC_SOURCE_DEVICE_POLICY) {
|
| - error_or_warning_found_ = true;
|
| - LOG(ERROR) << MessageHeader() << "Client certificate patterns are "
|
| - << "prohibited in ONC device policies.";
|
| - return true;
|
| - }
|
| - return false;
|
| -}
|
| -
|
| bool Validator::IsGlobalNetworkConfigInUserImport(
|
| const base::DictionaryValue& onc_object) {
|
| if (onc_source_ == ::onc::ONC_SOURCE_USER_IMPORT &&
|
|
|