chrome/browser/chromeos/cros/cros_mock.cc - Issue 8263003: cros: PowerLibrary virtual functions should be named using CamelCase.

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 8263003: cros: PowerLibrary virtual functions should be named using CamelCase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix browser_tests Created 9 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/automation/testing_automation_provider_chromeos.cc ('k') | chrome/browser/chromeos/cros/mock_power_library.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d2a84babbb8e14c2294169106341ebcdc71b6a1b..f592555439af4b4c56528d07565f49def20d0f55 100644

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

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

@@ -239,27 +239,27 @@ void CrosMock::SetPowerLibraryStatusAreaExpectations() {

EXPECT_CALL(*mock_power_library_, AddObserver(_))

.Times(3)

.RetiresOnSaturation();

- EXPECT_CALL(*mock_power_library_, battery_fully_charged())

+ EXPECT_CALL(*mock_power_library_, IsBatteryFullyCharged())

.Times(1)

.WillRepeatedly((Return(false)))

.RetiresOnSaturation();

- EXPECT_CALL(*mock_power_library_, battery_is_present())

+ EXPECT_CALL(*mock_power_library_, IsBatteryPresent())

.Times(1)

.WillOnce((Return(true)))

.RetiresOnSaturation();

- EXPECT_CALL(*mock_power_library_, battery_percentage())

+ EXPECT_CALL(*mock_power_library_, GetBatteryPercentage())

.Times(1)

.WillRepeatedly((Return(42.0)))

.RetiresOnSaturation();

- EXPECT_CALL(*mock_power_library_, line_power_on())

+ EXPECT_CALL(*mock_power_library_, IsLinePowerOn())

.Times(1)

.WillRepeatedly((Return(false)))

.RetiresOnSaturation();

- EXPECT_CALL(*mock_power_library_, battery_time_to_empty())

+ EXPECT_CALL(*mock_power_library_, GetBatteryTimeToEmpty())

.Times(1)

.WillRepeatedly((Return(base::TimeDelta::FromMinutes(42))))

.RetiresOnSaturation();

- EXPECT_CALL(*mock_power_library_, battery_time_to_full())

+ EXPECT_CALL(*mock_power_library_, GetBatteryTimeToFull())

.Times(1)

.WillRepeatedly((Return(base::TimeDelta::FromMinutes(24))))

.RetiresOnSaturation();