chrome/browser/chromeos/cros/cros_mock.cc - Issue 3744009: chromium-os:5494 Networks with identical names not handled properly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/cros/cros_mock.cc

Issue 3744009: chromium-os:5494 Networks with identical names not handled properly. (Closed)

Patch Set: Rebase from trunk. Created 10 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/chromeos/cros/cros_mock.cc

diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc

index 9761d9bd53f12cfa8ff625ad07683419f5215e05..ab33dc0344ff2671381160d7c850fa610e8efbd8 100644

--- a/chrome/browser/chromeos/cros/cros_mock.cc

+++ b/chrome/browser/chromeos/cros/cros_mock.cc

@@ -315,17 +315,17 @@ void CrosMock::SetNetworkLibraryStatusAreaExpectations() {

.Times(1)

.WillRepeatedly((Return(false)))

.RetiresOnSaturation();

- EXPECT_CALL(*mock_network_library_, wifi_name())

+ EXPECT_CALL(*mock_network_library_, wifi_network())

.Times(1)

- .WillRepeatedly((ReturnRef(empty_string_)))

+ .WillRepeatedly((ReturnRef(wifi_network_)))

.RetiresOnSaturation();

EXPECT_CALL(*mock_network_library_, cellular_networks())

.Times(1)

.WillRepeatedly((ReturnRef(cellular_networks_)))

.RetiresOnSaturation();

- EXPECT_CALL(*mock_network_library_, cellular_name())

+ EXPECT_CALL(*mock_network_library_, cellular_network())

.Times(1)

- .WillRepeatedly((ReturnRef(empty_string_)))

+ .WillRepeatedly((ReturnRef(cellular_network_)))

.RetiresOnSaturation();

EXPECT_CALL(*mock_network_library_, cellular_available())

.Times(1)