| 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 dcc2ead8be498098890ecffd0c1112a6267d46ce..046d96347a9c3a3ee961089467dd7e4853088675 100644
|
| --- a/chrome/browser/policy/network_configuration_updater.cc
|
| +++ b/chrome/browser/policy/network_configuration_updater.cc
|
| @@ -19,10 +19,12 @@ const char NetworkConfigurationUpdater::kEmptyConfiguration[] =
|
|
|
| NetworkConfigurationUpdater::NetworkConfigurationUpdater(
|
| PolicyService* policy_service,
|
| - chromeos::NetworkLibrary* network_library)
|
| + chromeos::NetworkLibrary* network_library,
|
| + bool allow_web_trust)
|
| : policy_change_registrar_(
|
| policy_service, POLICY_DOMAIN_CHROME, std::string()),
|
| - network_library_(network_library) {
|
| + network_library_(network_library),
|
| + allow_web_trust_(allow_web_trust) {
|
| DCHECK(network_library_);
|
| policy_change_registrar_.Observe(
|
| key::kDeviceOpenNetworkConfiguration,
|
| @@ -77,7 +79,7 @@ void NetworkConfigurationUpdater::ApplyNetworkConfiguration(
|
| *cached_value = new_network_config;
|
| std::string error;
|
| if (!network_library_->LoadOncNetworks(new_network_config, "", onc_source,
|
| - &error)) {
|
| + allow_web_trust_, &error)) {
|
| LOG(WARNING) << "Network library failed to load ONC configuration:"
|
| << error;
|
| }
|
|
|