summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-22 03:41:49 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-22 03:41:49 +0000
commit50dab3878b0a7e46413d22cc1f3ae5a93a883a36 (patch)
tree3b6975780628243a49d74a41005d9ea9d1a5ef91 /chrome
parentc3ffe1e34295c3d741909e50e7273225692788ce (diff)
downloadchromium_src-50dab3878b0a7e46413d22cc1f3ae5a93a883a36.zip
chromium_src-50dab3878b0a7e46413d22cc1f3ae5a93a883a36.tar.gz
chromium_src-50dab3878b0a7e46413d22cc1f3ae5a93a883a36.tar.bz2
Add expectation for NetworkLibrary.IsLocked (fix for 6292008)
BUG=chromium-os:9870 TEST=Run browser_tests. Review URL: http://codereview.chromium.org/6385002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/cros/cros_mock.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc
index a1fbfa2..a5d8a38 100644
--- a/chrome/browser/chromeos/cros/cros_mock.cc
+++ b/chrome/browser/chromeos/cros/cros_mock.cc
@@ -321,6 +321,10 @@ void CrosMock::SetNetworkLibraryStatusAreaExpectations() {
.RetiresOnSaturation();
// NetworkMenu::InitMenuItems() calls:
+ EXPECT_CALL(*mock_network_library_, IsLocked())
+ .Times(AnyNumber())
+ .WillRepeatedly((Return(false)))
+ .RetiresOnSaturation();
EXPECT_CALL(*mock_network_library_, ethernet_connected())
.Times(1)
.WillRepeatedly((Return(false)))