Merge FavoriteState into NetworkState

chromeos/network/network_connection_handler.cc

Index: chromeos/network/network_connection_handler.cc
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
index 380a0527b70995e2f3bb339a45073e0817fb7afe..cbdbec27fa98bc78fba6e68a9f9d7fe4d25f8ae0 100644
--- a/chromeos/network/network_connection_handler.cc
+++ b/chromeos/network/network_connection_handler.cc
@@ -819,8 +819,12 @@ void NetworkConnectionHandler::DisconnectIfPolicyRequires() {
   // Get the list of unmanaged & shared networks that are connected or
   // connecting.
   NetworkStateHandler::NetworkStateList networks;
-  network_state_handler_->GetNetworkListByType(NetworkTypePattern::Wireless(),
-                                               &networks);
+  network_state_handler_->GetNetworkListByType(

[stevenjb, 2014/05/28 23:06:10]

GetVisibleNetworksByType?

+      NetworkTypePattern::Wireless(),
+      false /* configured_only */,
+      true /* visible_only */,
+      0 /* no limit */,
+      &networks);
   for (NetworkStateHandler::NetworkStateList::const_iterator it =
            networks.begin();
        it != networks.end();