| Index: chrome/browser/policy/network_configuration_updater.cc
|
| diff --git a/chrome/browser/policy/network_configuration_updater.cc b/chrome/browser/policy/network_configuration_updater.cc
|
| index 8842cf5b8f5c18309fc2b6bbe5b7ace1018d2390..c692c19d5234a9dfb00d352b1d0c901f5415bbe1 100644
|
| --- a/chrome/browser/policy/network_configuration_updater.cc
|
| +++ b/chrome/browser/policy/network_configuration_updater.cc
|
| @@ -9,14 +9,12 @@
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "chrome/browser/chromeos/cros/network_library.h"
|
| +#include "chrome/browser/chromeos/network_settings/onc_utils.h"
|
| #include "chrome/browser/policy/policy_map.h"
|
| #include "policy/policy_constants.h"
|
|
|
| namespace policy {
|
|
|
| -const char NetworkConfigurationUpdater::kEmptyConfiguration[] =
|
| - "{\"NetworkConfigurations\":[],\"Certificates\":[]}";
|
| -
|
| NetworkConfigurationUpdater::NetworkConfigurationUpdater(
|
| PolicyService* policy_service,
|
| chromeos::NetworkLibrary* network_library)
|
| @@ -95,7 +93,7 @@ void NetworkConfigurationUpdater::ApplyNetworkConfiguration(
|
| // An empty string is not a valid ONC and generates warnings and
|
| // errors. Replace by a valid empty configuration.
|
| if (new_network_config.empty())
|
| - new_network_config = kEmptyConfiguration;
|
| + new_network_config = chromeos::onc::kEmptyUnencryptedConfiguration;
|
|
|
| std::string unused_error;
|
| network_library_->LoadOncNetworks(new_network_config, "", onc_source,
|
|
|