Move GetVisibleNetworks network type filtering to WiFiService interface.

components/wifi/fake_wifi_service.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "components/onc/onc_constants.h"
 
@@ skipping 89 matching lines @@
   virtual void SetProperties(const std::string& network_guid,
                              scoped_ptr<base::DictionaryValue> properties,
                              std::string* error) OVERRIDE {
     NetworkList::iterator network_properties = FindNetwork(network_guid);
     if (network_properties == networks_.end() ||
         !network_properties->UpdateFromValue(*properties)) {
       *error = "Error.DBusFailed";
     }
   }
 
-  virtual void GetVisibleNetworks(ListValue* network_list) OVERRIDE {
+  virtual void GetVisibleNetworks(const std::string& network_type,
+                                  ListValue* network_list) OVERRIDE {
     for (WiFiService::NetworkList::const_iterator it = networks_.begin();
          it != networks_.end();
          ++it) {
-      scoped_ptr<DictionaryValue> network(it->ToValue(true));
-      network_list->Append(network.release());
+      if (network_type.empty() ||
+          network_type == onc::network_type::kAllTypes ||
+          network_type == it->type) {

[tbarzic, 2013/11/26 18:39:36]

nit: I find it more natural to have the value that you're testing (it->type) on
the left and the value you test against (network_type) on the right of ==
(but, feel free to ignore this)

[mef, 2013/11/26 18:59:15]

Done.

+        scoped_ptr<DictionaryValue> network(it->ToValue(true));
+        network_list->Append(network.release());
+      }
     }
   }
 
   virtual void RequestNetworkScan() OVERRIDE {
     NotifyNetworkListChanged(networks_);
   }
 
   virtual void StartConnect(const std::string& network_guid,
                             std::string* error) OVERRIDE {
     NetworkList::iterator network_properties = FindNetwork(network_guid);
@@ skipping 77 matching lines @@
 
   NetworkList networks_;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   NetworkGuidListCallback networks_changed_observer_;
   NetworkGuidListCallback network_list_changed_observer_;
 };
 
 WiFiService* WiFiService::CreateForTest() { return new FakeWiFiService(); }
 
 }  // namespace wifi