Refactor WifiNetwork, CellularNetwork, and EthernetNetwork into classes to ma...

chrome/browser/chromeos/cros/mock_network_library.h

Index: chrome/browser/chromeos/cros/mock_network_library.h
===================================================================
--- chrome/browser/chromeos/cros/mock_network_library.h	(revision 46522)
+++ chrome/browser/chromeos/cros/mock_network_library.h	(working copy)
@@ -21,7 +21,7 @@
   MOCK_CONST_METHOD0(ethernet_network, const EthernetNetwork&(void));
   MOCK_CONST_METHOD0(ethernet_connecting, bool(void));
   MOCK_CONST_METHOD0(ethernet_connected, bool(void));
-  MOCK_CONST_METHOD0(wifi_ssid, const std::string&(void));
+  MOCK_CONST_METHOD0(wifi_name, const std::string&(void));
   MOCK_CONST_METHOD0(wifi_connecting, bool(void));
   MOCK_CONST_METHOD0(wifi_connected, bool(void));
   MOCK_CONST_METHOD0(wifi_strength, int(void));
@@ -48,11 +48,9 @@
                                           const string16&, const string16&,
                                           bool));
   MOCK_METHOD1(ConnectToCellularNetwork, void(CellularNetwork));
-  MOCK_METHOD1(DisconnectFromWifiNetwork, void(const WifiNetwork&));
-  MOCK_METHOD1(DisconnectFromCellularNetwork, void(const CellularNetwork&));
+  MOCK_METHOD1(DisconnectFromWirelessNetwork, void(const WirelessNetwork&));
   MOCK_METHOD1(SaveWifiNetwork, void(const WifiNetwork&));
-  MOCK_METHOD1(ForgetWifiNetwork, void(const WifiNetwork&));
-  MOCK_METHOD1(ForgetCellularNetwork, void(const CellularNetwork&));
+  MOCK_METHOD1(ForgetWirelessNetwork, void(const WirelessNetwork&));
 
   MOCK_CONST_METHOD0(ethernet_available, bool(void));
   MOCK_CONST_METHOD0(wifi_available, bool(void));