chromium-os:5494 Networks with identical names not handled properly.

chrome/browser/chromeos/cros/mock_network_library.h

Index: chrome/browser/chromeos/cros/mock_network_library.h
diff --git a/chrome/browser/chromeos/cros/mock_network_library.h b/chrome/browser/chromeos/cros/mock_network_library.h
index 543d4f6f1a0a6310cd64d245fb67608de94c6ef1..71922aa43a1e480e17c3ee8a2481c80e2f271d48 100644
--- a/chrome/browser/chromeos/cros/mock_network_library.h
+++ b/chrome/browser/chromeos/cros/mock_network_library.h
@@ -22,16 +22,13 @@ class MockNetworkLibrary : public NetworkLibrary {
   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_name, const std::string&(void));
+  MOCK_CONST_METHOD0(wifi_network, const WifiNetwork&(void));
   MOCK_CONST_METHOD0(wifi_connecting, bool(void));
   MOCK_CONST_METHOD0(wifi_connected, bool(void));
-  MOCK_CONST_METHOD0(wifi_strength, int(void));
 
-  MOCK_CONST_METHOD0(cellular_name, const std::string&(void));
-  MOCK_CONST_METHOD0(cellular_service_path, const std::string&(void));
+  MOCK_CONST_METHOD0(cellular_network, const CellularNetwork&(void));
   MOCK_CONST_METHOD0(cellular_connecting, bool(void));
   MOCK_CONST_METHOD0(cellular_connected, bool(void));
-  MOCK_CONST_METHOD0(cellular_strength, int(void));
 
   MOCK_CONST_METHOD0(Connected, bool(void));
   MOCK_CONST_METHOD0(Connecting, bool(void));