| Index: chromeos/network/managed_network_configuration_handler_impl.cc
|
| diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc
|
| index a92be669fc77424d8ecba71f2cc903c385080fc7..f8c50e4af9134f5dcfddf83fe927813a15e08c2b 100644
|
| --- a/chromeos/network/managed_network_configuration_handler_impl.cc
|
| +++ b/chromeos/network/managed_network_configuration_handler_impl.cc
|
| @@ -165,8 +165,8 @@ void ManagedNetworkConfigurationHandlerImpl::SendManagedProperties(
|
| ::onc::ONCSource onc_source;
|
| FindPolicyByGUID(userhash, guid, &onc_source);
|
| scoped_ptr<base::DictionaryValue> active_settings(
|
| - onc::TranslateShillServiceToONCPart(
|
| - *shill_properties, onc_source, &onc::kNetworkWithStateSignature));
|
| + network_util::TranslateShillPropertiesToONC(
|
| + service_path, *shill_properties, onc_source));
|
|
|
| const base::DictionaryValue* network_policy = NULL;
|
| const base::DictionaryValue* global_policy = NULL;
|
| @@ -214,9 +214,8 @@ void ManagedNetworkConfigurationHandlerImpl::SendProperties(
|
| const std::string& service_path,
|
| scoped_ptr<base::DictionaryValue> shill_properties) {
|
| scoped_ptr<base::DictionaryValue> onc_network(
|
| - onc::TranslateShillServiceToONCPart(
|
| - *shill_properties, ::onc::ONC_SOURCE_UNKNOWN,
|
| - &onc::kNetworkWithStateSignature));
|
| + network_util::TranslateShillPropertiesToONC(
|
| + service_path, *shill_properties, ::onc::ONC_SOURCE_UNKNOWN));
|
| callback.Run(service_path, *onc_network);
|
| }
|
|
|
|
|