ONC: Do not display errors when parsing empty EAP.EAP fields

chromeos/network/onc/onc_translator_shill_to_onc.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 618 matching lines @@
   TranslateSavedOrStaticIPConfig();
 }
 
 void ShillToONCTranslator::TranslateStaticIPConfig() {
   TranslateSavedOrStaticIPConfig();
 }
 
 void ShillToONCTranslator::TranslateEap() {
   CopyPropertiesAccordingToSignature();
 
-  // Translate EAP Outer and Inner values.
-  TranslateWithTableAndSet(shill::kEapMethodProperty, kEAPOuterTable,
-                           ::onc::eap::kOuter);
-  TranslateWithTableAndSet(shill::kEapPhase2AuthProperty, kEAP_TTLS_InnerTable,
-                           ::onc::eap::kInner);
+  // Translate EAP Outer and Inner values if EAP.EAP exists and is not empty.
+  std::string shill_eap;
+  if (shill_dictionary_->GetStringWithoutPathExpansion(
+          shill::kEapMethodProperty, &shill_eap) &&
+      !shill_eap.empty()) {
+    TranslateWithTableAndSet(shill::kEapMethodProperty, kEAPOuterTable,
+                             ::onc::eap::kOuter);
+    TranslateWithTableAndSet(shill::kEapPhase2AuthProperty,
+                             kEAP_TTLS_InnerTable, ::onc::eap::kInner);
+  }
 }
 
 void ShillToONCTranslator::TranslateAndAddNestedObject(
     const std::string& onc_field_name) {
   TranslateAndAddNestedObject(onc_field_name, *shill_dictionary_);
 }
 
 void ShillToONCTranslator::TranslateAndAddNestedObject(
     const std::string& onc_field_name,
     const base::DictionaryValue& dictionary) {
@@ skipping 137 matching lines @@
     const NetworkState* network_state) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, onc_source, *onc_signature,
                                   network_state);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos