| 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 f20cdcc356cfd0ac54185fc38422bc9da0837160..a92be669fc77424d8ecba71f2cc903c385080fc7 100644
|
| --- a/chromeos/network/managed_network_configuration_handler_impl.cc
|
| +++ b/chromeos/network/managed_network_configuration_handler_impl.cc
|
| @@ -164,12 +164,9 @@
|
|
|
| ::onc::ONCSource onc_source;
|
| FindPolicyByGUID(userhash, guid, &onc_source);
|
| - const NetworkState* network_state =
|
| - network_state_handler_->GetNetworkState(service_path);
|
| scoped_ptr<base::DictionaryValue> active_settings(
|
| - onc::TranslateShillServiceToONCPart(*shill_properties, onc_source,
|
| - &onc::kNetworkWithStateSignature,
|
| - network_state));
|
| + onc::TranslateShillServiceToONCPart(
|
| + *shill_properties, onc_source, &onc::kNetworkWithStateSignature));
|
|
|
| const base::DictionaryValue* network_policy = NULL;
|
| const base::DictionaryValue* global_policy = NULL;
|
| @@ -216,12 +213,10 @@
|
| const network_handler::ErrorCallback& error_callback,
|
| const std::string& service_path,
|
| scoped_ptr<base::DictionaryValue> shill_properties) {
|
| - const NetworkState* network_state =
|
| - network_state_handler_->GetNetworkState(service_path);
|
| scoped_ptr<base::DictionaryValue> onc_network(
|
| onc::TranslateShillServiceToONCPart(
|
| *shill_properties, ::onc::ONC_SOURCE_UNKNOWN,
|
| - &onc::kNetworkWithStateSignature, network_state));
|
| + &onc::kNetworkWithStateSignature));
|
| callback.Run(service_path, *onc_network);
|
| }
|
|
|
|
|