ONC: Cleanup client certificate related fields.

chromeos/network/network_ui_data.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/network_ui_data.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_signature.h"
 
@@ skipping 130 matching lines @@
                 certificate_pattern_.CreateONCDictionary().release());
     }
   }
   if (user_settings_)
     dict->SetWithoutPathExpansion(kKeyUserSettings,
                                   user_settings_->DeepCopy());
 }
 
 namespace {
 
-void TranslateClientCertType(const std::string& client_cert_type,
-                             NetworkUIData* ui_data) {
-  using namespace ::onc::certificate;
+void GetAndTranslateClientCertType(const base::DictionaryValue& onc_object,
+                                   NetworkUIData* ui_data) {
+  using namespace ::onc::client_cert;
+
+  std::string client_cert_type;
+  if (!onc_object.GetStringWithoutPathExpansion(kClientCertType,
+                                                &client_cert_type)) {
+    return;
+  }
+
   ClientCertType type;
-  if (client_cert_type == kNone) {
+  if (client_cert_type == kClientCertTypeNone) {
     type = CLIENT_CERT_TYPE_NONE;
   } else if (client_cert_type == kRef) {
     type = CLIENT_CERT_TYPE_REF;
   } else if (client_cert_type == kPattern) {
     type = CLIENT_CERT_TYPE_PATTERN;
   } else {
     type = CLIENT_CERT_TYPE_NONE;
     NOTREACHED();
   }
 
   ui_data->set_certificate_type(type);
 }
 
 void TranslateCertificatePattern(const base::DictionaryValue& onc_object,
                                  NetworkUIData* ui_data) {
   CertificatePattern pattern;
   bool success = pattern.ReadFromONCDictionary(onc_object);
   DCHECK(success);
   ui_data->set_certificate_pattern(pattern);
 }
 
-void TranslateEAP(const base::DictionaryValue& eap,
-                  NetworkUIData* ui_data) {
-  std::string client_cert_type;
-  if (eap.GetStringWithoutPathExpansion(::onc::eap::kClientCertType,
-                                        &client_cert_type)) {
-    TranslateClientCertType(client_cert_type, ui_data);
-  }
-}
-
-void TranslateIPsec(const base::DictionaryValue& ipsec,
-                    NetworkUIData* ui_data) {
-  std::string client_cert_type;
-  if (ipsec.GetStringWithoutPathExpansion(::onc::vpn::kClientCertType,
-                                          &client_cert_type)) {
-    TranslateClientCertType(client_cert_type, ui_data);
-  }
-}
-
-void TranslateOpenVPN(const base::DictionaryValue& openvpn,
-                      NetworkUIData* ui_data) {
-  std::string client_cert_type;
-  if (openvpn.GetStringWithoutPathExpansion(::onc::vpn::kClientCertType,
-                                            &client_cert_type)) {
-    TranslateClientCertType(client_cert_type, ui_data);
-  }
-}
-
 void TranslateONCHierarchy(const onc::OncValueSignature& signature,
                            const base::DictionaryValue& onc_object,
                            NetworkUIData* ui_data) {
-  if (&signature == &onc::kCertificatePatternSignature)
+  if (&signature == &onc::kCertificatePatternSignature) {
     TranslateCertificatePattern(onc_object, ui_data);
-  else if (&signature == &onc::kEAPSignature)
-    TranslateEAP(onc_object, ui_data);
-  else if (&signature == &onc::kIPsecSignature)
-    TranslateIPsec(onc_object, ui_data);
-  else if (&signature == &onc::kOpenVPNSignature)
-    TranslateOpenVPN(onc_object, ui_data);
+  } else if (&signature == &onc::kEAPSignature ||
+             &signature == &onc::kIPsecSignature ||
+             &signature == &onc::kOpenVPNSignature) {
+    GetAndTranslateClientCertType(onc_object, ui_data);
+  }
 
   // Recurse into nested objects.
   for (base::DictionaryValue::Iterator it(onc_object); !it.IsAtEnd();
        it.Advance()) {
     const base::DictionaryValue* inner_object;
     if (!it.value().GetAsDictionary(&inner_object))
       continue;
 
     const onc::OncFieldSignature* field_signature =
         GetFieldSignature(signature, it.key());
@@ skipping 12 matching lines @@
   scoped_ptr<NetworkUIData> ui_data(new NetworkUIData());
   TranslateONCHierarchy(onc::kNetworkConfigurationSignature, onc_network,
                         ui_data.get());
 
   ui_data->set_onc_source(onc_source);
 
   return ui_data.Pass();
 }
 
 }  // namespace chromeos