Removing VCMCodecDataBase::Codec and VideoCodingModule::Codec.

webrtc/modules/video_coding/video_receiver_unittest.cc

 /*
  *  Copyright (c) 2013 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 <vector>
 
 #include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h"
 #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
 #include "webrtc/modules/video_coding/test/test_util.h"
 #include "webrtc/modules/video_coding/timing.h"
 #include "webrtc/modules/video_coding/video_coding_impl.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gtest.h"
+#include "webrtc/test/video_codec_settings.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::NiceMock;
 
 namespace webrtc {
 namespace vcm {
 namespace {
 
 class TestVideoReceiver : public ::testing::Test {
  protected:
   static const int kUnusedPayloadType = 10;
 
   TestVideoReceiver() : clock_(0) {}
 
   virtual void SetUp() {
     timing_.reset(new VCMTiming(&clock_));
     receiver_.reset(
         new VideoReceiver(&clock_, &event_factory_, nullptr, timing_.get()));
     receiver_->RegisterExternalDecoder(&decoder_, kUnusedPayloadType);
     const size_t kMaxNackListSize = 250;
     const int kMaxPacketAgeToNack = 450;
     receiver_->SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, 0);
 
-    VideoCodingModule::Codec(kVideoCodecVP8, &settings_);
+    webrtc::test::CodecSettings(kVideoCodecVP8, &settings_);
     settings_.plType = kUnusedPayloadType;  // Use the mocked encoder.
     EXPECT_EQ(0, receiver_->RegisterReceiveCodec(&settings_, 1, true));
 
     // Since we call Decode, we need to provide a valid receive callback.
     // However, for the purposes of these tests, we ignore the callbacks.
     EXPECT_CALL(receive_callback_, OnIncomingPayloadType(_)).Times(AnyNumber());
     EXPECT_CALL(receive_callback_, OnDecoderImplementationName(_))
         .Times(AnyNumber());
     receiver_->RegisterReceiveCallback(&receive_callback_);
   }
@@ skipping 156 matching lines @@
 TEST_F(TestVideoReceiver, ReceiverDelay) {
   EXPECT_EQ(0, receiver_->SetMinReceiverDelay(0));
   EXPECT_EQ(0, receiver_->SetMinReceiverDelay(5000));
   EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(-100));
   EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(10010));
 }
 
 }  // namespace
 }  // namespace vcm
 }  // namespace webrtc