commit e3bdf0f5596602809185ec3ee0321b2eb8144693
author Bruno Rocha <bpontes@google.com> Thu Aug 18 11:28:30 2011 -0700
committer Gaurav Shah <gauravsh@chromium.org> Mon Aug 22 13:07:28 2011 -0700
tree caeacece900de52b04818fe21e4b09fb1ec0f046
parent be388f301b9fef2e4ecd0cd9612dfe9216b5b266

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 <gauravsh@chromium.org>
Reviewed-by: Bruno Pontes Soares Rocha <bpontes@chromium.org>
Tested-by: Bruno Pontes Soares Rocha <bpontes@chromium.org>

metrics/timer_mock.h

diff --git a/metrics/timer_mock.h b/metrics/timer_mock.h
index ef29191..1f0c9de 100644
--- a/metrics/timer_mock.h
+++ b/metrics/timer_mock.h
@@ -27,12 +27,17 @@
 
 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 {