Revert of Add framerate to VideoSinkWants and ability to signal on overuse

webrtc/media/base/videobroadcaster_unittest.cc

Index: webrtc/media/base/videobroadcaster_unittest.cc
diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/webrtc/media/base/videobroadcaster_unittest.cc
index ad9ccb7dbcc86bc3b60e0a47d95fce535c2c1c1e..5274868204589856369a9a1a46a9b41c68c37b7c 100644
--- a/webrtc/media/base/videobroadcaster_unittest.cc
+++ b/webrtc/media/base/videobroadcaster_unittest.cc
@@ -87,24 +87,23 @@
 
 TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxPixelCount) {
   VideoBroadcaster broadcaster;
-  EXPECT_EQ(std::numeric_limits<int>::max(),
-            broadcaster.wants().max_pixel_count);
+  EXPECT_TRUE(!broadcaster.wants().max_pixel_count);
 
   FakeVideoRenderer sink1;
   VideoSinkWants wants1;
-  wants1.max_pixel_count = 1280 * 720;
+  wants1.max_pixel_count = rtc::Optional<int>(1280 * 720);
 
   broadcaster.AddOrUpdateSink(&sink1, wants1);
-  EXPECT_EQ(1280 * 720, broadcaster.wants().max_pixel_count);
+  EXPECT_EQ(1280 * 720, *broadcaster.wants().max_pixel_count);
 
   FakeVideoRenderer sink2;
   VideoSinkWants wants2;
-  wants2.max_pixel_count = 640 * 360;
+  wants2.max_pixel_count = rtc::Optional<int>(640 * 360);
   broadcaster.AddOrUpdateSink(&sink2, wants2);
-  EXPECT_EQ(640 * 360, broadcaster.wants().max_pixel_count);
+  EXPECT_EQ(640 * 360, *broadcaster.wants().max_pixel_count);
 
   broadcaster.RemoveSink(&sink2);
-  EXPECT_EQ(1280 * 720, broadcaster.wants().max_pixel_count);
+  EXPECT_EQ(1280 * 720, *broadcaster.wants().max_pixel_count);
 }
 
 TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxAndTargetPixelCount) {
@@ -126,28 +125,6 @@
 
   broadcaster.RemoveSink(&sink2);
   EXPECT_EQ(1280 * 720, *broadcaster.wants().target_pixel_count);
-}
-
-TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxFramerate) {
-  VideoBroadcaster broadcaster;
-  EXPECT_EQ(std::numeric_limits<int>::max(),
-            broadcaster.wants().max_framerate_fps);
-
-  FakeVideoRenderer sink1;
-  VideoSinkWants wants1;
-  wants1.max_framerate_fps = 30;
-
-  broadcaster.AddOrUpdateSink(&sink1, wants1);
-  EXPECT_EQ(30, broadcaster.wants().max_framerate_fps);
-
-  FakeVideoRenderer sink2;
-  VideoSinkWants wants2;
-  wants2.max_framerate_fps = 15;
-  broadcaster.AddOrUpdateSink(&sink2, wants2);
-  EXPECT_EQ(15, broadcaster.wants().max_framerate_fps);
-
-  broadcaster.RemoveSink(&sink2);
-  EXPECT_EQ(30, broadcaster.wants().max_framerate_fps);
 }
 
 TEST(VideoBroadcasterTest, SinkWantsBlackFrames) {