Index: chrome/browser/chromeos/options/vpn_config_view.cc |
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc |
index e20d685fcd232de312e976f396fadcf7c4e8a443..099b00578e937e80063184d0f0107f7565910f8e 100644 |
--- a/chrome/browser/chromeos/options/vpn_config_view.cc |
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc |
@@ -837,12 +837,11 @@ void VPNConfigView::SetConfigProperties( |
} |
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( |
@@ -860,12 +859,11 @@ void VPNConfigView::SetConfigProperties( |
} |
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()); |