Moved injection of AudioDecoderFactory into voe::Channel.

webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <memory>
 
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
 #include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/safe_conversions.h"
+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/modules/audio_coding/neteq/accelerate.h"
 #include "webrtc/modules/audio_coding/neteq/expand.h"
 #include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h"
 #include "webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h"
 #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
 #include "webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h"
 #include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h"
 #include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h"
 #include "webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h"
 #include "webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h"
@@ skipping 23 matching lines @@
 int DeletePacketsAndReturnOk(PacketList* packet_list) {
   PacketBuffer::DeleteAllPackets(packet_list);
   return PacketBuffer::kOK;
 }
 
 class NetEqImplTest : public ::testing::Test {
  protected:
   NetEqImplTest() { config_.sample_rate_hz = 8000; }
 
   void CreateInstance() {
-    NetEqImpl::Dependencies deps(config_);
+    NetEqImpl::Dependencies deps(config_, CreateBuiltinAudioDecoderFactory());
 
     // Get a local pointer to NetEq's TickTimer object.
     tick_timer_ = deps.tick_timer.get();
 
     if (use_mock_buffer_level_filter_) {
       std::unique_ptr<MockBufferLevelFilter> mock(new MockBufferLevelFilter);
       mock_buffer_level_filter_ = mock.get();
       deps.buffer_level_filter = std::move(mock);
     }
     buffer_level_filter_ = deps.buffer_level_filter.get();
@@ skipping 125 matching lines @@
   MockPayloadSplitter* mock_payload_splitter_ = nullptr;
   PayloadSplitter* payload_splitter_ = nullptr;
   bool use_mock_payload_splitter_ = true;
 };
 
 
 // This tests the interface class NetEq.
 // TODO(hlundin): Move to separate file?
 TEST(NetEq, CreateAndDestroy) {
   NetEq::Config config;
-  NetEq* neteq = NetEq::Create(config);
+  NetEq* neteq = NetEq::Create(config, CreateBuiltinAudioDecoderFactory());
   delete neteq;
 }
 
 TEST_F(NetEqImplTest, RegisterPayloadType) {
   CreateInstance();
   uint8_t rtp_payload_type = 0;
   NetEqDecoder codec_type = NetEqDecoder::kDecoderPCMu;
   const std::string kCodecName = "Robert\'); DROP TABLE Students;";
   EXPECT_CALL(*mock_decoder_database_,
               RegisterPayload(rtp_payload_type, codec_type, kCodecName));
@@ skipping 1194 matching lines @@
   EXPECT_CALL(*mock_delay_manager_, BufferLimits(_, _))
       .Times(1)
       .WillOnce(DoAll(SetArgPointee<0>(1), SetArgPointee<1>(2)));
 
   bool muted;
   EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output_, &muted));
   EXPECT_EQ(kAccelerate, neteq_->last_operation_for_test());
 }
 
 }// namespace webrtc