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 a6e1bb92c603141b945e3203c8c60deec132b0dd..3123ab0bf1c81035dd2919720f95b41202ff725b 100644 |
--- a/chrome/browser/chromeos/cros/mock_network_library.h |
+++ b/chrome/browser/chromeos/cros/mock_network_library.h |
@@ -45,10 +45,14 @@ class MockNetworkLibrary : public NetworkLibrary { |
MOCK_METHOD0(ConnectToPreferredNetworkIfAvailable, bool(void)); |
MOCK_METHOD0(PreferredNetworkConnected, bool(void)); |
MOCK_METHOD0(PreferredNetworkFailed, bool(void)); |
- MOCK_METHOD4(ConnectToWifiNetwork, void(WifiNetwork, const string16&, |
- const string16&, const string16&)); |
- MOCK_METHOD5(ConnectToWifiNetwork, void(const string16&, const string16&, |
- const string16&, const string16&, |
+ MOCK_METHOD4(ConnectToWifiNetwork, void(WifiNetwork, |
+ const std::string&, |
+ const std::string&, |
+ const std::string&)); |
+ MOCK_METHOD5(ConnectToWifiNetwork, void(const std::string&, |
+ const std::string&, |
+ const std::string&, |
+ const std::string&, |
bool)); |
MOCK_METHOD1(ConnectToCellularNetwork, void(CellularNetwork)); |
MOCK_METHOD1(DisconnectFromWirelessNetwork, void(const WirelessNetwork&)); |