diff options
Diffstat (limited to 'chrome/browser/chromeos/cros/network_library.cc')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index d1625d1..43acb7c 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -1745,8 +1745,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, - std::string* error) OVERRIDE; + const std::string& passcode) OVERRIDE; virtual bool SetActiveNetwork(ConnectionType type, const std::string& service_path) OVERRIDE; @@ -2835,23 +2834,14 @@ void NetworkLibraryImplBase::SwitchToPreferredNetwork() { } bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob, - const std::string& passcode, - std::string* error) { + const std::string& passcode) { // TODO(gspencer): Add support for decrypting onc files. crbug.com/19397 OncNetworkParser parser(onc_blob); - if (!parser.parse_error().empty()) { - if (error) - *error = parser.parse_error(); - return false; - } - for (int i = 0; i < parser.GetCertificatesSize(); i++) { // Insert each of the available certs into the certificate DB. if (parser.ParseCertificate(i).get() == NULL) { DLOG(WARNING) << "Cannot parse certificate in ONC file"; - if (error) - *error = parser.parse_error(); return false; } } @@ -2861,8 +2851,6 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob, scoped_ptr<Network> network(parser.ParseNetwork(i)); if (!network.get()) { DLOG(WARNING) << "Cannot parse network in ONC file"; - if (error) - *error = parser.parse_error(); return false; } @@ -2880,15 +2868,8 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob, CallConfigureService(network->unique_id(), &dict); } - - if (parser.GetNetworkConfigsSize() != 0 || - parser.GetCertificatesSize() != 0) { - if (error) - *error = l10n_util::GetStringUTF8( - IDS_NETWORK_CONFIG_ERROR_NETWORK_IMPORT); - return false; - } - return true; + return (parser.GetNetworkConfigsSize() != 0 || + parser.GetCertificatesSize() != 0); } //////////////////////////////////////////////////////////////////////////// @@ -5121,7 +5102,7 @@ void NetworkLibraryImplStub::Init() { " ]," " \"Certificates\": []" "}"); - LoadOncNetworks(test_blob, "", NULL); + LoadOncNetworks(test_blob, ""); } //////////////////////////////////////////////////////////////////////////// |