Fix accumulation error with front_timestamp, move test only code.

media/filters/audio_clock_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/buffers.h"
 #include "media/filters/audio_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
@@ skipping 22 matching lines @@
   int BackTimestampInMilliseconds() {
     return clock_.back_timestamp().InMilliseconds();
   }
 
   int TimeUntilPlaybackInMilliseconds(int timestamp_ms) {
     return clock_.TimeUntilPlayback(base::TimeDelta::FromMilliseconds(
                                         timestamp_ms)).InMilliseconds();
   }
 
   int ContiguousAudioDataBufferedInDays() {
-    return clock_.contiguous_audio_data_buffered().InDays();
+    base::TimeDelta total, same_rate_total;
+    clock_.ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
+    return total.InDays();
   }
 
   int ContiguousAudioDataBufferedInMilliseconds() {
-    return clock_.contiguous_audio_data_buffered().InMilliseconds();
+    base::TimeDelta total, same_rate_total;
+    clock_.ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
+    return total.InMilliseconds();
   }
 
   int ContiguousAudioDataBufferedAtSameRateInMilliseconds() {
-    return clock_.contiguous_audio_data_buffered_at_same_rate()
-        .InMilliseconds();
+    base::TimeDelta total, same_rate_total;
+    clock_.ContiguousAudioDataBufferedForTesting(&total, &same_rate_total);
+    return same_rate_total.InMilliseconds();
   }
 
   const int sample_rate_;
   AudioClock clock_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioClockTest);
 };
 
 TEST_F(AudioClockTest, FrontTimestampStartsAtStartTimestamp) {
   base::TimeDelta expected = base::TimeDelta::FromSeconds(123);
   AudioClock clock(expected, sample_rate_);
 
   EXPECT_EQ(expected, clock.front_timestamp());
 }
 
 TEST_F(AudioClockTest, BackTimestampStartsAtStartTimestamp) {
   base::TimeDelta expected = base::TimeDelta::FromSeconds(123);
   AudioClock clock(expected, sample_rate_);
 
   EXPECT_EQ(expected, clock.back_timestamp());
 }
 
-TEST_F(AudioClockTest, ContiguousAudioDataBufferedStartsAtZero) {
-  EXPECT_EQ(base::TimeDelta(), clock_.contiguous_audio_data_buffered());
-}
-
-TEST_F(AudioClockTest, ContiguousAudioDataBufferedAtSameRateStartsAtZero) {
-  EXPECT_EQ(base::TimeDelta(),
-            clock_.contiguous_audio_data_buffered_at_same_rate());
-}
-
 TEST_F(AudioClockTest, Playback) {
   // The first time we write data we should still expect our start timestamp
   // due to delay.
   WroteAudio(10, 10, 20, 1.0);
   EXPECT_EQ(0, FrontTimestampInMilliseconds());
   EXPECT_EQ(1000, BackTimestampInMilliseconds());
   EXPECT_EQ(0, ContiguousAudioDataBufferedInMilliseconds());
   EXPECT_EQ(0, ContiguousAudioDataBufferedAtSameRateInMilliseconds());
 
   // The media time should remain at start timestamp as we write data.
@@ skipping 255 matching lines @@
   }
 
   // Exhausting all frames should advance timestamps and prime the buffer with
   // our delay frames value.
   clock_.CompensateForSuspendedWrites(base::TimeDelta::FromMilliseconds(7000),
                                       kDelayFrames);
   EXPECT_EQ(kDelayFrames * 100, TimeUntilPlaybackInMilliseconds(1000));
 }
 
 }  // namespace media