| Index: chrome/browser/chromeos/cros/network_library.cc
|
| diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
|
| index 5e1ec8aea85b8c2363634babfb1ee86596610568..5e94226942c65bf2e1aefffc37ed50d72bd4f39e 100644
|
| --- a/chrome/browser/chromeos/cros/network_library.cc
|
| +++ b/chrome/browser/chromeos/cros/network_library.cc
|
| @@ -1769,7 +1769,7 @@ class NetworkLibraryImplBase : public NetworkLibrary {
|
| // virtual SetIPConfig implemented in derived classes.
|
| virtual void SwitchToPreferredNetwork() OVERRIDE;
|
| virtual bool LoadOncNetworks(const std::string& onc_blob,
|
| - const std::string& passcode,
|
| + const std::string& passphrase,
|
| NetworkUIData::ONCSource source,
|
| std::string* error) OVERRIDE;
|
| virtual bool SetActiveNetwork(ConnectionType type,
|
| @@ -2887,11 +2887,10 @@ void NetworkLibraryImplBase::SwitchToPreferredNetwork() {
|
| }
|
|
|
| bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
|
| - const std::string& passcode,
|
| + const std::string& passphrase,
|
| NetworkUIData::ONCSource source,
|
| std::string* error) {
|
| - // TODO(gspencer): Add support for decrypting onc files. crbug.com/19397
|
| - OncNetworkParser parser(onc_blob, source);
|
| + OncNetworkParser parser(onc_blob, passphrase, source);
|
|
|
| if (!parser.parse_error().empty()) {
|
| if (error)
|
|
|