Fix network configurations that use the system CA certs.

chrome/browser/chromeos/options/vpn_config_view.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 "chrome/browser/chromeos/options/vpn_config_view.h"
 
 #include "ash/system/chromeos/network/network_connect.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 819 matching lines @@
             shill::kL2tpIpsecUserProperty, user_name);
       }
       if (!user_passphrase.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kL2tpIpsecPasswordProperty, user_passphrase);
       }
       break;
     }
     case PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT: {
       std::string ca_cert_pem = GetServerCACertPEM();
-      if (!ca_cert_pem.empty()) {
-        base::ListValue* pem_list = new base::ListValue;
+      base::ListValue* pem_list = new base::ListValue;
+      if (!ca_cert_pem.empty())
         pem_list->AppendString(ca_cert_pem);
-        properties->SetWithoutPathExpansion(
-            shill::kL2tpIpsecCaCertPemProperty, pem_list);
-      }
+      properties->SetWithoutPathExpansion(shill::kL2tpIpsecCaCertPemProperty,
+                                          pem_list);
       SetUserCertProperties(client_cert::CONFIG_TYPE_IPSEC, properties);
       if (!group_name.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kL2tpIpsecTunnelGroupProperty, GetGroupName());
       }
       if (!user_name.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kL2tpIpsecUserProperty, user_name);
       }
       if (!user_passphrase.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kL2tpIpsecPasswordProperty, user_passphrase);
       }
       break;
     }
     case PROVIDER_TYPE_INDEX_OPEN_VPN: {
       std::string ca_cert_pem = GetServerCACertPEM();
-      if (!ca_cert_pem.empty()) {
-        base::ListValue* pem_list = new base::ListValue;
+      base::ListValue* pem_list = new base::ListValue;
+      if (!ca_cert_pem.empty())
         pem_list->AppendString(ca_cert_pem);
-        properties->SetWithoutPathExpansion(
-            shill::kOpenVPNCaCertPemProperty, pem_list);
-      }
+      properties->SetWithoutPathExpansion(shill::kOpenVPNCaCertPemProperty,
+                                          pem_list);
       SetUserCertProperties(client_cert::CONFIG_TYPE_OPENVPN, properties);
       properties->SetStringWithoutPathExpansion(
           shill::kOpenVPNUserProperty, GetUsername());
       if (!user_passphrase.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kOpenVPNPasswordProperty, user_passphrase);
       }
       std::string otp = GetOTP();
       if (!otp.empty()) {
         properties->SetStringWithoutPathExpansion(
@@ skipping 185 matching lines @@
   property_ui_data->ParseOncProperty(
       onc_source,
       onc,
       base::StringPrintf("%s.%s.%s",
                          ::onc::network_config::kVPN,
                          dict_key.c_str(),
                          key.c_str()));
 }
 
 }  // namespace chromeos