Adding cbr support for Opus

webrtc/audio/audio_send_stream_unittest.cc

Index: webrtc/audio/audio_send_stream_unittest.cc
diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/webrtc/audio/audio_send_stream_unittest.cc
index 318ea955cf79dd0906c0d17164235d9330ff6d16..5d3526e3a0dba826dce515b55d812f95e7370550 100644
--- a/webrtc/audio/audio_send_stream_unittest.cc
+++ b/webrtc/audio/audio_send_stream_unittest.cc
@@ -285,8 +285,9 @@ TEST(AudioSendStreamTest, ConfigToString) {
       "{rtp_history_ms: 0}, c_name: foo_name}, send_transport: null, "
       "voe_channel_id: 1, min_bitrate_bps: 12000, max_bitrate_bps: 34000, "
       "send_codec_spec: {nack_enabled: true, transport_cc_enabled: false, "
-      "enable_codec_fec: true, enable_opus_dtx: false, opus_max_playback_rate: "
-      "32000, cng_payload_type: 42, cng_plfreq: 56, min_ptime: 20, max_ptime: "
+      "enable_codec_fec: true, enable_opus_dtx: false, enable_opus_cbr: false, "
+      "opus_max_playback_rate: 32000, "
+      "cng_payload_type: 42, cng_plfreq: 56, min_ptime: 20, max_ptime: "
       "60, codec_inst: {pltype: 103, plname: \"isac\", plfreq: 16000, pacsize: "
       "320, channels: 1, rate: 32000}}}",
       config.ToString());
@@ -395,6 +396,7 @@ TEST(AudioSendStreamTest, SendCodecAppliesConfigParams) {
   stream_config.send_codec_spec.codec_inst = kOpusCodec;
   stream_config.send_codec_spec.enable_codec_fec = true;
   stream_config.send_codec_spec.enable_opus_dtx = true;
+  stream_config.send_codec_spec.enable_opus_cbr = true;
   stream_config.send_codec_spec.opus_max_playback_rate = 12345;
   stream_config.send_codec_spec.cng_plfreq = 16000;
   stream_config.send_codec_spec.cng_payload_type = 105;
@@ -408,10 +410,12 @@ TEST(AudioSendStreamTest, SendCodecAppliesConfigParams) {
       *helper.channel_proxy(),
       SetOpusDtx(stream_config.send_codec_spec.enable_opus_dtx))
       .WillOnce(Return(true));
-  EXPECT_CALL(
-      *helper.channel_proxy(),
-      SetOpusMaxPlaybackRate(
-          stream_config.send_codec_spec.opus_max_playback_rate))
+  EXPECT_CALL(*helper.channel_proxy(),
+              SetOpusCbr(stream_config.send_codec_spec.enable_opus_cbr))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*helper.channel_proxy(),
+              SetOpusMaxPlaybackRate(
+                  stream_config.send_codec_spec.opus_max_playback_rate))
       .WillOnce(Return(true));
   EXPECT_CALL(*helper.channel_proxy(),
               SetSendCNPayloadType(