WIP: Adding a centralized NetEq Clock

webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

Index: webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
index e9291d1815fe4fc9786368bcb10c879c8d10db78..8a6cd3be9300560b826720fde6361016d0fbf546 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
@@ -57,6 +57,7 @@ class NetEqImplTest : public ::testing::Test {
   NetEqImplTest()
       : neteq_(NULL),
         config_(),
+        tick_timer_(new TickTimer),
         mock_buffer_level_filter_(NULL),
         buffer_level_filter_(NULL),
         use_mock_buffer_level_filter_(true),
@@ -101,20 +102,20 @@ class NetEqImplTest : public ::testing::Test {
       decoder_database_ = new DecoderDatabase;
     }
     if (use_mock_delay_peak_detector_) {
-      mock_delay_peak_detector_ = new MockDelayPeakDetector;
+      mock_delay_peak_detector_ = new MockDelayPeakDetector(*tick_timer_);
       EXPECT_CALL(*mock_delay_peak_detector_, Reset()).Times(1);
       delay_peak_detector_ = mock_delay_peak_detector_;
     } else {
-      delay_peak_detector_ = new DelayPeakDetector;
+      delay_peak_detector_ = new DelayPeakDetector(*tick_timer_);
     }
     if (use_mock_delay_manager_) {
-      mock_delay_manager_ = new MockDelayManager(config_.max_packets_in_buffer,
-                                                 delay_peak_detector_);
+      mock_delay_manager_ = new MockDelayManager(
+          config_.max_packets_in_buffer, delay_peak_detector_, *tick_timer_);
       EXPECT_CALL(*mock_delay_manager_, set_streaming_mode(false)).Times(1);
       delay_manager_ = mock_delay_manager_;
     } else {
-      delay_manager_ =
-          new DelayManager(config_.max_packets_in_buffer, delay_peak_detector_);
+      delay_manager_ = new DelayManager(config_.max_packets_in_buffer,
+                                        delay_peak_detector_, *tick_timer_);
     }
     if (use_mock_dtmf_buffer_) {
       mock_dtmf_buffer_ = new MockDtmfBuffer(config_.sample_rate_hz);
@@ -129,10 +130,12 @@ class NetEqImplTest : public ::testing::Test {
       dtmf_tone_generator_ = new DtmfToneGenerator;
     }
     if (use_mock_packet_buffer_) {
-      mock_packet_buffer_ = new MockPacketBuffer(config_.max_packets_in_buffer);
+      mock_packet_buffer_ =
+          new MockPacketBuffer(config_.max_packets_in_buffer, *tick_timer_);
       packet_buffer_ = mock_packet_buffer_;
     } else {
-      packet_buffer_ = new PacketBuffer(config_.max_packets_in_buffer);
+      packet_buffer_ =
+          new PacketBuffer(config_.max_packets_in_buffer, *tick_timer_);
     }
     if (use_mock_payload_splitter_) {
       mock_payload_splitter_ = new MockPayloadSplitter;
@@ -146,19 +149,12 @@ class NetEqImplTest : public ::testing::Test {
     PreemptiveExpandFactory* preemptive_expand_factory =
         new PreemptiveExpandFactory;
 
-    neteq_ = new NetEqImpl(config_,
-                           buffer_level_filter_,
-                           decoder_database_,
-                           delay_manager_,
-                           delay_peak_detector_,
-                           dtmf_buffer_,
-                           dtmf_tone_generator_,
-                           packet_buffer_,
-                           payload_splitter_,
-                           timestamp_scaler_,
-                           accelerate_factory,
-                           expand_factory,
-                           preemptive_expand_factory);
+    neteq_ =
+        new NetEqImpl(config_, std::move(tick_timer_), buffer_level_filter_,
+                      decoder_database_, delay_manager_, delay_peak_detector_,
+                      dtmf_buffer_, dtmf_tone_generator_, packet_buffer_,
+                      payload_splitter_, timestamp_scaler_, accelerate_factory,
+                      expand_factory, preemptive_expand_factory);
     ASSERT_TRUE(neteq_ != NULL);
   }
 
@@ -201,6 +197,7 @@ class NetEqImplTest : public ::testing::Test {
 
   NetEqImpl* neteq_;
   NetEq::Config config_;
+  std::unique_ptr<TickTimer> tick_timer_;
   MockBufferLevelFilter* mock_buffer_level_filter_;
   BufferLevelFilter* buffer_level_filter_;
   bool use_mock_buffer_level_filter_;