| Index: chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc
|
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc
|
| index 9ec6aa4a06f9533e72329382aeb029c3e0cfc5ff..e91e194b19ddfc43ca7ce0b0cadd8d677ed58725 100644
|
| --- a/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc
|
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc
|
| @@ -275,30 +275,12 @@ bool NetworkingPrivateGetVisibleNetworksFunction::RunImpl() {
|
| scoped_ptr<api::GetVisibleNetworks::Params> params =
|
| api::GetVisibleNetworks::Params::Create(*args_);
|
| EXTENSION_FUNCTION_VALIDATE(params);
|
| - NetworkTypePattern type = chromeos::onc::NetworkTypePatternFromOncType(
|
| + NetworkTypePattern pattern = chromeos::onc::NetworkTypePatternFromOncType(
|
| api::GetVisibleNetworks::Params::ToString(params->type));
|
|
|
| - NetworkStateHandler::NetworkStateList network_states;
|
| - NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
|
| - type, &network_states);
|
| -
|
| - base::ListValue* network_properties_list = new base::ListValue;
|
| - for (NetworkStateHandler::NetworkStateList::iterator it =
|
| - network_states.begin();
|
| - it != network_states.end(); ++it) {
|
| - base::DictionaryValue shill_dictionary;
|
| - (*it)->GetStateProperties(&shill_dictionary);
|
| -
|
| - scoped_ptr<base::DictionaryValue> onc_network_part =
|
| - chromeos::onc::TranslateShillServiceToONCPart(
|
| - shill_dictionary, &chromeos::onc::kNetworkWithStateSignature);
|
| - // TODO(stevenjb): Fix this to always use GUID: crbug.com/284827
|
| - onc_network_part->SetStringWithoutPathExpansion(
|
| - onc::network_config::kGUID, (*it)->path());
|
| - network_properties_list->Append(onc_network_part.release());
|
| - }
|
| -
|
| - SetResult(network_properties_list);
|
| + scoped_ptr<base::ListValue> network_properties_list =
|
| + chromeos::onc::TranslateShillNetworkListToONC(pattern);
|
| + SetResult(network_properties_list.release());
|
| SendResponse(true);
|
| return true;
|
| }
|
|
|