diff --git a/metrics/counter_mock.h b/metrics/counter_mock.h
index cf2a486..267aaca 100644
--- a/metrics/counter_mock.h
+++ b/metrics/counter_mock.h
@@ -34,9 +34,7 @@
 
 class FrequencyCounterMock : public FrequencyCounter {
  public:
-  MOCK_METHOD4(Init, void(const char* filename,
-                          TaggedCounterInterface::Reporter reporter,
-                          void* reporter_handle,
+  MOCK_METHOD2(Init, void(TaggedCounterInterface* tagged_counter,
                           time_t cycle_duration));
   MOCK_METHOD1(Update, void(int32 count));
   MOCK_METHOD0(FlushFinishedCycles, void());
diff --git a/metrics/metrics_daemon_test.cc b/metrics/metrics_daemon_test.cc
index 92240a2..d27597c 100644
--- a/metrics/metrics_daemon_test.cc
+++ b/metrics/metrics_daemon_test.cc
@@ -57,12 +57,6 @@
       : TimeTicks(seconds * Time::kMicrosecondsPerSecond) {}
 };
 
-// Overloaded for test failure printing purposes.
-static std::ostream& operator<<(std::ostream& o, const Time& time) {
-  o << time.ToInternalValue() << "us";
-  return o;
-};
-
 class MetricsDaemonTest : public testing::Test {
  protected:
   virtual void SetUp() {