Move GetVisibleNetworks network type filtering to WiFiService interface.

components/wifi/wifi_service_win.cc

Index: components/wifi/wifi_service_win.cc
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
index 052062db1a757f5f4bfa617b74cf9e96bc186876..e3a61545df2aee507c0ef0325dcca3784f3c235b 100644
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
@@ -154,8 +154,10 @@ class WiFiServiceImpl : public WiFiService, base::NonThreadSafe {
                              scoped_ptr<base::DictionaryValue> properties,
                              std::string* error) OVERRIDE;
 
-  // Get list of visible networks. Populates |network_list| on success.
-  virtual void GetVisibleNetworks(ListValue* network_list) OVERRIDE;
+  // Get list of visible networks of |network_type| (one of onc::network_type).
+  // Populates |network_list| on success.
+  virtual void GetVisibleNetworks(const std::string& network_type,
+                                   ListValue* network_list) OVERRIDE;
 
   // Request network scan. Send |NetworkListChanged| event on completion.
   virtual void RequestNetworkScan() OVERRIDE;
@@ -424,9 +426,13 @@ void WiFiServiceImpl::SetProperties(
   CheckError(ERROR_CALL_NOT_IMPLEMENTED, kWiFiServiceError, error);
 }
 
-void WiFiServiceImpl::GetVisibleNetworks(ListValue* network_list) {
-  DWORD error = EnsureInitialized();
+void WiFiServiceImpl::GetVisibleNetworks(const std::string& network_type,
+                                         ListValue* network_list) {
+  DCHECK(network_type.empty() ||
+         network_type == onc::network_type::kAllTypes ||
+         network_type == onc::network_type::kWiFi);

[stevenjb, 2013/11/26 17:35:55]

network_type comes more-or-less directly from the JS, right? Unless we logically
ensure this condition somewhere, this should fail gracefully (i.e. WARNING +
early exit instead of CHECK).

[mef, 2013/11/26 18:30:39]

Done.

 
+  DWORD error = EnsureInitialized();
   if (error == ERROR_SUCCESS) {
     NetworkList networks;
     error = GetVisibleNetworkList(&networks);