Move GetVisibleNetworks network type filtering to WiFiService interface.

components/wifi/wifi_service_win.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/wifi/wifi_service.h"
 
 #include <iphlpapi.h>
 #include <objbase.h>
 #include <wlanapi.h>
 
@@ skipping 136 matching lines @@
   virtual void GetProperties(const std::string& network_guid,
                              DictionaryValue* properties,
                              std::string* error) OVERRIDE;
 
   // Set Properties of network identified by |network_guid|. Populates |error|
   // on failure.
   virtual void SetProperties(const std::string& network_guid,
                              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;
 
   // Start connect to network identified by |network_guid|. Populates |error|
   // on failure.
   virtual void StartConnect(const std::string& network_guid,
                             std::string* error) OVERRIDE;
 
   // Start disconnect from network identified by |network_guid|. Populates
@@ skipping 248 matching lines @@
 
 void WiFiServiceImpl::SetProperties(
     const std::string& network_guid,
     scoped_ptr<base::DictionaryValue> properties,
     std::string* error) {
   // This method is not implemented in first version as it is not used by
   // Google Cast extension.
   CheckError(ERROR_CALL_NOT_IMPLEMENTED, kWiFiServiceError, error);
 }
 
-void WiFiServiceImpl::GetVisibleNetworks(ListValue* network_list) {
+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);
     if (error == ERROR_SUCCESS && !networks.empty()) {
       SortNetworks(&networks);
       for (WiFiService::NetworkList::const_iterator it = networks.begin();
            it != networks.end();
            ++it) {
         scoped_ptr<DictionaryValue> network(it->ToValue(true));
         network_list->Append(network.release());
@@ skipping 825 matching lines @@
     NetworkGuidList changed_networks(1, network_guid);
     message_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(networks_changed_observer_, changed_networks));
   }
 }
 
 WiFiService* WiFiService::Create() { return new WiFiServiceImpl(); }
 
 }  // namespace wifi