From e3bdf0f5596602809185ec3ee0321b2eb8144693 Mon Sep 17 00:00:00 2001 From: Bruno Rocha Date: Thu, 18 Aug 2011 11:28:30 -0700 Subject: [PATCH] Fixed wrong method signatures in TimerReporterMock. TimerReporterMock had some wrong method signatures, and was lacking signatures for its accessor methods. BUG=chromium-os:18800 TEST=None Change-Id: I08d832857c1ae3df907f5470433117f7a03fe125 Reviewed-on: http://gerrit.chromium.org/gerrit/6230 Reviewed-by: Gaurav Shah Reviewed-by: Bruno Pontes Soares Rocha Tested-by: Bruno Pontes Soares Rocha --- metrics/timer_mock.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/metrics/timer_mock.h b/metrics/timer_mock.h index ef29191a2..1f0c9de60 100644 --- a/metrics/timer_mock.h +++ b/metrics/timer_mock.h @@ -27,12 +27,17 @@ class TimerMock : public Timer { class TimerReporterMock : public TimerReporter { public: + TimerReporterMock() : TimerReporter("",0,0,0) {} MOCK_METHOD0(Start, bool()); MOCK_METHOD0(Stop, bool()); MOCK_METHOD0(Reset, bool()); MOCK_CONST_METHOD0(HasStarted, bool()); - MOCK_CONST_METHOD0(GetElapsedTime, base::TimeDelta()); + MOCK_CONST_METHOD1(GetElapsedTime, bool(base::TimeDelta* elapsed_time)); MOCK_CONST_METHOD0(ReportMilliseconds, bool()); + MOCK_CONST_METHOD0(histogram_name, std::string&()); + MOCK_CONST_METHOD0(min, int()); + MOCK_CONST_METHOD0(max, int()); + MOCK_CONST_METHOD0(num_buckets, int()); }; class ClockWrapperMock : public ClockWrapper {