Removing `preference` field from `cricket::Codec`.

webrtc/pc/channelmanager_unittest.cc

 /*
  *  Copyright 2008 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 "webrtc/api/fakemediacontroller.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakevideocapturer.h"
 #include "webrtc/media/base/testutils.h"
 #include "webrtc/media/engine/fakewebrtccall.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 #include "webrtc/pc/channelmanager.h"
 
 namespace cricket {
 
 static const AudioCodec kAudioCodecs[] = {
-  AudioCodec(97, "voice", 1, 2, 3, 0),
-  AudioCodec(111, "OPUS", 48000, 32000, 2, 0),
+    AudioCodec(97, "voice", 1, 2, 3), AudioCodec(111, "OPUS", 48000, 32000, 2),
 };
 
 static const VideoCodec kVideoCodecs[] = {
-  VideoCodec(99, "H264", 100, 200, 300, 0),
-  VideoCodec(100, "VP8", 100, 200, 300, 0),
-  VideoCodec(96, "rtx", 100, 200, 300, 0),
+    VideoCodec(99, "H264", 100, 200, 300),
+    VideoCodec(100, "VP8", 100, 200, 300), VideoCodec(96, "rtx", 100, 200, 300),
 };
 
 class ChannelManagerTest : public testing::Test {
  protected:
   ChannelManagerTest()
       : fme_(new cricket::FakeMediaEngine()),
         fdme_(new cricket::FakeDataEngine()),
         cm_(new cricket::ChannelManager(fme_,
                                         fdme_,
                                         rtc::Thread::Current())),
@@ skipping 148 matching lines @@
 
   EXPECT_FALSE(cm_->SetOutputVolume(-1));  // Invalid volume.
   EXPECT_TRUE(cm_->SetOutputVolume(60));
   EXPECT_EQ(60, fme_->output_volume());
   EXPECT_TRUE(cm_->GetOutputVolume(&level));
   EXPECT_EQ(60, level);
 }
 
 TEST_F(ChannelManagerTest, SetVideoRtxEnabled) {
   std::vector<VideoCodec> codecs;
-  const VideoCodec rtx_codec(96, "rtx", 0, 0, 0, 0);
+  const VideoCodec rtx_codec(96, "rtx", 0, 0, 0);
 
   // By default RTX is disabled.
   cm_->GetSupportedVideoCodecs(&codecs);
   EXPECT_FALSE(ContainsMatchingCodec(codecs, rtx_codec));
 
   // Enable and check.
   EXPECT_TRUE(cm_->SetVideoRtxEnabled(true));
   cm_->GetSupportedVideoCodecs(&codecs);
   EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec));
 
   // Disable and check.
   EXPECT_TRUE(cm_->SetVideoRtxEnabled(false));
   cm_->GetSupportedVideoCodecs(&codecs);
   EXPECT_FALSE(ContainsMatchingCodec(codecs, rtx_codec));
 
   // Cannot toggle rtx after initialization.
   EXPECT_TRUE(cm_->Init());
   EXPECT_FALSE(cm_->SetVideoRtxEnabled(true));
   EXPECT_FALSE(cm_->SetVideoRtxEnabled(false));
 
   // Can set again after terminate.
   cm_->Terminate();
   EXPECT_TRUE(cm_->SetVideoRtxEnabled(true));
   cm_->GetSupportedVideoCodecs(&codecs);
   EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec));
 }
 
 }  // namespace cricket