diff options
Diffstat (limited to 'chrome/browser/chromeos/cros/network_library.cc')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 068b596..e770515 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -826,15 +826,11 @@ void VirtualNetwork::SetL2TPIPsecPSKCredentials( const std::string& username, const std::string& user_passphrase, const std::string& group_name) { - if (!psk_passphrase.empty()) { - SetStringProperty(flimflam::kL2tpIpsecPskProperty, - psk_passphrase, &psk_passphrase_); - } + SetStringProperty(flimflam::kL2tpIpsecPskProperty, + psk_passphrase, &psk_passphrase_); SetStringProperty(flimflam::kL2tpIpsecUserProperty, username, &username_); - if (!user_passphrase.empty()) { - SetStringProperty(flimflam::kL2tpIpsecPasswordProperty, - user_passphrase, &user_passphrase_); - } + SetStringProperty(flimflam::kL2tpIpsecPasswordProperty, + user_passphrase, &user_passphrase_); SetStringProperty(flimflam::kL2tpIpsecGroupNameProperty, group_name, &group_name_); } @@ -847,10 +843,8 @@ void VirtualNetwork::SetL2TPIPsecCertCredentials( SetStringProperty(flimflam::kL2tpIpsecClientCertIdProperty, client_cert_id, &client_cert_id_); SetStringProperty(flimflam::kL2tpIpsecUserProperty, username, &username_); - if (!user_passphrase.empty()) { - SetStringProperty(flimflam::kL2tpIpsecPasswordProperty, - user_passphrase, &user_passphrase_); - } + SetStringProperty(flimflam::kL2tpIpsecPasswordProperty, + user_passphrase, &user_passphrase_); SetStringProperty(flimflam::kL2tpIpsecGroupNameProperty, group_name, &group_name_); } @@ -5289,25 +5283,16 @@ void NetworkLibraryImplStub::Init() { " \"NetworkConfigurations\": [" " {" " \"GUID\": \"guid\"," - " \"Type\": \"VPN\"," - " \"Name\": \"VPNtest\"," - " \"VPN\": {" - " \"Host\": \"172.22.12.98\"," - " \"Type\": \"L2TP-IPsec\"," - " \"IPsec\": {" - " \"AuthenticationType\": \"PSK\"," - " \"IKEVersion\": 2," - " \"PSK\": \"chromeos\"," - " }," - " \"L2TP\": {" - " \"Username\": \"vpntest\"," - " }" + " \"Type\": \"WiFi\"," + " \"WiFi\": {" + " \"Security\": \"WEP\"," + " \"SSID\": \"MySSID\"," " }" " }" " ]," " \"Certificates\": []" "}"); -// LoadOncNetworks(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT, NULL); + LoadOncNetworks(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT, NULL); } //////////////////////////////////////////////////////////////////////////// |