diff options
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library_impl_base.cc | 2 | ||||
| -rw-r--r-- | chromeos/network/onc/onc_translator_shill_to_onc.cc | 5 | ||||
| -rw-r--r-- | chromeos/network/onc/onc_validator.cc | 21 |
3 files changed, 13 insertions, 15 deletions
diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc index 1068c47..e96e862 100644 --- a/chrome/browser/chromeos/cros/network_library_impl_base.cc +++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc @@ -1096,7 +1096,7 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob, // Check and see if this is an encrypted ONC file. If so, decrypt it. std::string onc_type; - root_dict->GetStringWithoutPathExpansion(onc::network_config::kType, + root_dict->GetStringWithoutPathExpansion(onc::toplevel_config::kType, &onc_type); if (onc_type == onc::toplevel_config::kEncryptedConfiguration) { root_dict = onc::Decrypt(passphrase, *root_dict); diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc index 7a020572..4083995 100644 --- a/chromeos/network/onc/onc_translator_shill_to_onc.cc +++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc @@ -176,7 +176,7 @@ void ShillToONCTranslator::TranslateWiFi() { std::string bssid; if (shill_dictionary_->GetStringWithoutPathExpansion(flimflam::kWifiBSsid, &bssid)) { - onc_object_->SetString(wifi::kBSSID, bssid); + onc_object_->SetStringWithoutPathExpansion(wifi::kBSSID, bssid); } } @@ -217,7 +217,8 @@ void ShillToONCTranslator::TranslateNetworkConfiguration() { } else if (NetworkState::StateIsConnecting(state)) { onc_state = connection_state::kConnecting; } - onc_object_->SetString(network_config::kConnectionState, onc_state); + onc_object_->SetStringWithoutPathExpansion(network_config::kConnectionState, + onc_state); } } diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc index c674653..3c74cff 100644 --- a/chromeos/network/onc/onc_validator.cc +++ b/chromeos/network/onc/onc_validator.cc @@ -387,13 +387,10 @@ bool Validator::ValidateToplevelConfiguration( return false; } - static const char* kValidTypes[] = - { kUnencryptedConfiguration, - kEncryptedConfiguration, - NULL }; - if (FieldExistsAndHasNoValidValue(*result, - kType, - kValidTypes)) + static const char* kValidTypes[] = { kUnencryptedConfiguration, + kEncryptedConfiguration, + NULL }; + if (FieldExistsAndHasNoValidValue(*result, kType, kValidTypes)) return false; bool allRequiredExist = true; @@ -407,9 +404,8 @@ bool Validator::ValidateToplevelConfiguration( !result->HasKey(kCertificates)) { error_or_warning_found_ = true; std::string message = MessageHeader(error_on_missing_field_) + - "Neither the field '" + kNetworkConfigurations + - "' nor '" + kCertificates + - "is present, but at least one is required."; + "Neither the field '" + kNetworkConfigurations + "' nor '" + + kCertificates + "is present, but at least one is required."; if (error_on_missing_field_) LOG(ERROR) << message; else @@ -433,6 +429,7 @@ bool Validator::ValidateNetworkConfiguration( static const char* kValidTypes[] = { network_type::kEthernet, network_type::kVPN, network_type::kWiFi, + network_type::kCellular, NULL }; if (FieldExistsAndHasNoValidValue(*result, kType, @@ -469,8 +466,8 @@ bool Validator::ValidateNetworkConfiguration( allRequiredExist &= RequireField(*result, network_config::kCellular); else if (type == network_type::kVPN) allRequiredExist &= RequireField(*result, network_config::kVPN); - else - LOG(ERROR) << "Unknown network type " << type << " encountered"; + else if (!type.empty()) + NOTREACHED(); } return !error_on_missing_field_ || allRequiredExist; |