Elim 'Translated' from Managed ONC dictionary

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 "chromeos/network/onc/onc_translator.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
@@ skipping 222 matching lines @@
                  << "' has value " << *shill_value
                  << ", but expected a string: " << GetName();
     }
   }
 }
 
 void ShillToONCTranslator::TranslateIPsec() {
   CopyPropertiesAccordingToSignature();
   if (shill_dictionary_->HasKey(shill::kL2tpIpsecXauthUserProperty))
     TranslateAndAddNestedObject(::onc::ipsec::kXAUTH);
+  std::string client_cert_id;
+  shill_dictionary_->GetStringWithoutPathExpansion(

[pneubeck (no reviews), 2014/09/04 12:50:14]

+Ben who ran into this issue before, see this comment in
network_connection_handler.cc:

      // TODO(benchan): Modify shill to specify the authentication type via
      // the kL2tpIpsecAuthenticationType property, so that Chrome doesn't need
      // to deduce the authentication type based on the
      // kL2tpIpsecClientCertIdProperty here (and also in VPNConfigView).

Ben, could we fix this for 39?
How would Shill deduce the Authentication Type? or would Shill just report back
what Chrome previously configured?

[stevenjb, 2014/09/04 15:34:11]

I'd rather not block this on a Shill change, we can always fix this later if we
add the property to Shill. Is there anything inherently wrong with this logic
(it's pretty much just copied from internet_options_handler_strings.cc.

[pneubeck (no reviews), 2014/09/04 18:05:20]

I didn't intend to suggest blocking this. This should be clarified
independently.

+      shill::kL2tpIpsecClientCertIdProperty, &client_cert_id);
+  std::string authentication_type =
+      client_cert_id.empty() ? ::onc::ipsec::kPSK : ::onc::ipsec::kCert;
+  onc_object_->SetStringWithoutPathExpansion(::onc::ipsec::kAuthenticationType,
+                                             authentication_type);
 }
 
 void ShillToONCTranslator::TranslateVPN() {
   CopyPropertiesAccordingToSignature();
 
   // Parse Shill Provider dictionary. Note, this may not exist, e.g. if we are
   // just translating network state in network_util::TranslateNetworkStateToONC.
   const base::DictionaryValue* provider = NULL;
   if (!shill_dictionary_->GetDictionaryWithoutPathExpansion(
           shill::kProviderProperty, &provider)) {
@@ skipping 321 matching lines @@
     const base::DictionaryValue& shill_dictionary,
     const OncValueSignature* onc_signature) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, *onc_signature);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos