| Index: chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| index 3cf9789f447a15e9f2f19ca46946dada92098583..9cea03314c35f060a6d04cbc0f75ca4f11f50ed3 100644
|
| --- a/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| +++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc
|
| @@ -126,7 +126,6 @@ void LocalTranslator::TranslateEthernet() {
|
| CopyFieldsAccordingToSignature();
|
| }
|
|
|
| -
|
| void LocalTranslator::TranslateOpenVPN() {
|
| // SaveCredentials needs special handling when translating from Shill -> ONC
|
| // so handle it explicitly here.
|
| @@ -216,8 +215,8 @@ void LocalTranslator::TranslateVPN() {
|
|
|
| void LocalTranslator::TranslateWiFi() {
|
| std::string security;
|
| - if (onc_object_->GetStringWithoutPathExpansion(
|
| - ::onc::wifi::kSecurity, &security)) {
|
| + if (onc_object_->GetStringWithoutPathExpansion(::onc::wifi::kSecurity,
|
| + &security)) {
|
| TranslateWithTableAndSet(security, kWiFiSecurityTable,
|
| shill::kSecurityClassProperty);
|
| }
|
| @@ -249,9 +248,9 @@ void LocalTranslator::TranslateEAP() {
|
| // Shill.
|
| onc_object_->GetStringWithoutPathExpansion(::onc::eap::kInner, &inner);
|
| if (inner != ::onc::eap::kAutomatic) {
|
| - const StringTranslationEntry* table =
|
| - outer == ::onc::eap::kPEAP ? kEAP_PEAP_InnerTable :
|
| - kEAP_TTLS_InnerTable;
|
| + const StringTranslationEntry* table = outer == ::onc::eap::kPEAP
|
| + ? kEAP_PEAP_InnerTable
|
| + : kEAP_TTLS_InnerTable;
|
| TranslateWithTableAndSet(inner, table, shill::kEapPhase2AuthProperty);
|
| }
|
| }
|
| @@ -328,8 +327,8 @@ void LocalTranslator::AddValueAccordingToSignature(
|
| if (!value || !field_translation_table_)
|
| return;
|
| std::string shill_property_name;
|
| - if (!GetShillPropertyName(
|
| - onc_name, field_translation_table_, &shill_property_name)) {
|
| + if (!GetShillPropertyName(onc_name, field_translation_table_,
|
| + &shill_property_name)) {
|
| return;
|
| }
|
|
|
| @@ -366,8 +365,7 @@ void TranslateONCHierarchy(const OncValueSignature& signature,
|
| GetPathToNestedShillDictionary(signature);
|
| for (std::vector<std::string>::const_iterator it =
|
| path_to_shill_dictionary.begin();
|
| - it != path_to_shill_dictionary.end();
|
| - ++it) {
|
| + it != path_to_shill_dictionary.end(); ++it) {
|
| base::DictionaryValue* nested_shill_dict = NULL;
|
| target_shill_dictionary->GetDictionaryWithoutPathExpansion(
|
| *it, &nested_shill_dict);
|
|
|