summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 18:23:18 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 18:23:18 +0000
commit6e57226ad7bb3dea87f5c12caa2ee06e5062b904 (patch)
tree1c5d913335709875291655cc985bd2abf36c870b
parentff834c461d287054642cd180fbfaf45bf7459143 (diff)
downloadchromium_src-6e57226ad7bb3dea87f5c12caa2ee06e5062b904.zip
chromium_src-6e57226ad7bb3dea87f5c12caa2ee06e5062b904.tar.gz
chromium_src-6e57226ad7bb3dea87f5c12caa2ee06e5062b904.tar.bz2
Revert 45206 - fix chromium os build.
TBR=chocobo@chromium.org Review URL: http://codereview.chromium.org/1697005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45208 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/cros/mock_network_library.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/cros/mock_network_library.h b/chrome/browser/chromeos/cros/mock_network_library.h
index 7773a6e..9930999 100644
--- a/chrome/browser/chromeos/cros/mock_network_library.h
+++ b/chrome/browser/chromeos/cros/mock_network_library.h
@@ -42,10 +42,10 @@ class MockNetworkLibrary : public NetworkLibrary {
const CellularNetworkVector&(void));
MOCK_METHOD0(RequestWifiScan, void(void));
- MOCK_METHOD2(ConnectToWifiNetwork, void(WifiNetwork, const string16&,
- const string16&, const string16&));
- MOCK_METHOD2(ConnectToWifiNetwork, void(const string16&, const string16&,
- const string16&, const string16&));
+ MOCK_METHOD2(ConnectToWifiNetwork, void(WifiNetwork,
+ const string16&));
+ MOCK_METHOD2(ConnectToWifiNetwork, void(const string16&,
+ const string16&));
MOCK_METHOD1(ConnectToCellularNetwork, void(CellularNetwork));
MOCK_METHOD1(ForgetWifiNetwork, void(const WifiNetwork&));
MOCK_METHOD1(ForgetCellularNetwork, void(const CellularNetwork&));