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

webrtc/call/call_perf_tests.cc

Index: webrtc/call/call_perf_tests.cc
diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc
index d4067502c25e9841af9edfb27a7a4653bfb47a8e..a421c24d56558fd29880f0074338b938b3a94a6e 100644
--- a/webrtc/call/call_perf_tests.cc
+++ b/webrtc/call/call_perf_tests.cc
@@ -494,13 +494,14 @@
       // First expect CPU overuse. Then expect CPU underuse when the encoder
       // delay has been decreased.
       if (wants.target_pixel_count &&
-          *wants.target_pixel_count < wants.max_pixel_count) {
+          *wants.target_pixel_count <
+              wants.max_pixel_count.value_or(std::numeric_limits<int>::max())) {
         // On adapting up, ViEEncoder::VideoSourceProxy will set the target
         // pixel count to a step up from the current and the max value to
         // something higher than the target.
         EXPECT_FALSE(expect_lower_resolution_wants_);
         observation_complete_.Set();
-      } else if (wants.max_pixel_count < std::numeric_limits<int>::max()) {
+      } else if (wants.max_pixel_count) {
         // On adapting down, ViEEncoder::VideoSourceProxy will set only the max
         // pixel count, leaving the target unset.
         EXPECT_TRUE(expect_lower_resolution_wants_);