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

webrtc/api/webrtcsession_unittest.cc

Index: webrtc/api/webrtcsession_unittest.cc
diff --git a/webrtc/api/webrtcsession_unittest.cc b/webrtc/api/webrtcsession_unittest.cc
index 77c4854680bf141d2c1ae194f74ee0ad1b59edb2..e60989ac6d5c5d42ab6e9368d2e3d3793becd386 100644
--- a/webrtc/api/webrtcsession_unittest.cc
+++ b/webrtc/api/webrtcsession_unittest.cc
@@ -3477,25 +3477,25 @@ TEST_F(WebRtcSessionTest, SetVideoMaxSendBitrate) {
   cricket::FakeVideoMediaChannel* channel = media_engine_->GetVideoChannel(0);
   ASSERT_TRUE(channel != NULL);
   uint32_t send_ssrc = channel->send_streams()[0].first_ssrc();
-  EXPECT_EQ(-1, channel->max_bps());
+  EXPECT_EQ(rtc::Optional<int>(), channel->max_bps());
   webrtc::RtpParameters params = session_->GetVideoRtpParameters(send_ssrc);
   EXPECT_EQ(1, params.encodings.size());
-  EXPECT_EQ(-1, params.encodings[0].max_bitrate_bps);
-  params.encodings[0].max_bitrate_bps = 1000;
+  EXPECT_EQ(rtc::Optional<int>(), params.encodings[0].max_bitrate_bps);
+  params.encodings[0].max_bitrate_bps = rtc::Optional<int>(1000);
   EXPECT_TRUE(session_->SetVideoRtpParameters(send_ssrc, params));
 
   // Read back the parameters and verify they have been changed.
   params = session_->GetVideoRtpParameters(send_ssrc);
   EXPECT_EQ(1, params.encodings.size());
-  EXPECT_EQ(1000, params.encodings[0].max_bitrate_bps);
+  EXPECT_EQ(rtc::Optional<int>(1000), params.encodings[0].max_bitrate_bps);
 
   // Verify that the video channel received the new parameters.
   params = channel->GetRtpParameters(send_ssrc);
   EXPECT_EQ(1, params.encodings.size());
-  EXPECT_EQ(1000, params.encodings[0].max_bitrate_bps);
+  EXPECT_EQ(rtc::Optional<int>(1000), params.encodings[0].max_bitrate_bps);
 
   // Verify that the global bitrate limit has not been changed.
-  EXPECT_EQ(-1, channel->max_bps());
+  EXPECT_EQ(rtc::Optional<int>(), channel->max_bps());
 }
 
 TEST_F(WebRtcSessionTest, SetVideoSend) {