Updated structures and functions for setting the max bitrate limit to take rtc::Optional<int>

webrtc/pc/channel_unittest.cc

Index: webrtc/pc/channel_unittest.cc
diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
index 686f85d9eae792761e23fff64b6e142b2cd10c0e..9a8dd8a193b2e33d9e61cbdf540115a5939c962a 100644
--- a/webrtc/pc/channel_unittest.cc
+++ b/webrtc/pc/channel_unittest.cc
@@ -1810,7 +1810,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     return channel1_->SetRemoteContent(&content, CA_OFFER, NULL);
   }
 
-  webrtc::RtpParameters BitrateLimitedParameters(int limit) {
+  webrtc::RtpParameters BitrateLimitedParameters(rtc::Optional<int> limit) {
     webrtc::RtpParameters parameters;
     webrtc::RtpEncodingParameters encoding;
     encoding.max_bitrate_bps = limit;
@@ -1819,7 +1819,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
   }
 
   void VerifyMaxBitrate(const webrtc::RtpParameters& parameters,
-                        int expected_bitrate) {
+                        rtc::Optional<int> expected_bitrate) {
     EXPECT_EQ(1UL, parameters.encodings.size());
     EXPECT_EQ(expected_bitrate, parameters.encodings[0].max_bitrate_bps);
   }
@@ -1828,8 +1828,9 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     CreateChannels(0, 0);
     EXPECT_TRUE(
         channel1_->SetLocalContent(&local_media_content1_, CA_OFFER, NULL));
-    EXPECT_EQ(media_channel1_->max_bps(), -1);
-    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1), -1);
+    EXPECT_EQ(rtc::Optional<int>(), media_channel1_->max_bps());
+    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1),
+                     rtc::Optional<int>());
   }
 
   void CanChangeMaxBitrate() {
@@ -1837,17 +1838,20 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     EXPECT_TRUE(
         channel1_->SetLocalContent(&local_media_content1_, CA_OFFER, NULL));
 
-    EXPECT_TRUE(
-        channel1_->SetRtpParameters(kSsrc1, BitrateLimitedParameters(1000)));
-    VerifyMaxBitrate(channel1_->GetRtpParameters(kSsrc1), 1000);
-    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1), 1000);
-    EXPECT_EQ(-1, media_channel1_->max_bps());
+    EXPECT_TRUE(channel1_->SetRtpParameters(
+        kSsrc1, BitrateLimitedParameters(rtc::Optional<int>(1000))));
+    VerifyMaxBitrate(channel1_->GetRtpParameters(kSsrc1),
+                     rtc::Optional<int>(1000));
+    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1),
+                     rtc::Optional<int>(1000));
+    EXPECT_EQ(rtc::Optional<int>(), media_channel1_->max_bps());
 
-    EXPECT_TRUE(
-        channel1_->SetRtpParameters(kSsrc1, BitrateLimitedParameters(-1)));
-    VerifyMaxBitrate(channel1_->GetRtpParameters(kSsrc1), -1);
-    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1), -1);
-    EXPECT_EQ(-1, media_channel1_->max_bps());
+    EXPECT_TRUE(channel1_->SetRtpParameters(
+        kSsrc1, BitrateLimitedParameters(rtc::Optional<int>())));
+    VerifyMaxBitrate(channel1_->GetRtpParameters(kSsrc1), rtc::Optional<int>());
+    VerifyMaxBitrate(media_channel1_->GetRtpParameters(kSsrc1),
+                     rtc::Optional<int>());
+    EXPECT_EQ(rtc::Optional<int>(), media_channel1_->max_bps());
   }
 
  protected:
@@ -2326,8 +2330,8 @@ TEST_F(VoiceChannelTest, SetRtpParametersIsNotImplemented) {
   CreateChannels(0, 0);
   EXPECT_TRUE(
       channel1_->SetLocalContent(&local_media_content1_, CA_OFFER, NULL));
-  EXPECT_FALSE(
-      channel1_->SetRtpParameters(kSsrc1, BitrateLimitedParameters(1000)));
+  EXPECT_FALSE(channel1_->SetRtpParameters(
+      kSsrc1, BitrateLimitedParameters(rtc::Optional<int>(1000))));
 }
 
 // VideoChannelTest