commit 3de32e6e8c55e74f91713d1f19d2f774b1a157f6
author Niels Möller <nisse@webrtc.org> Fri Jan 18 07:42:18 2019
committer Commit Bot <commit-bot@chromium.org> Fri Jan 18 13:28:47 2019
tree 505470b9b9ba23b8fdfa799ae938ea2c069198a8
parent 3eaf9f169cd04dcd15ecda60add655da249f9b36

Add test WebRtcVideoChannelTest.DoesNotAdaptWhenScreeensharing

Bug: None
Change-Id: Ib0c8a2eeb816631aac65236114b0487104a5c698
Reviewed-on: https://webrtc-review.googlesource.com/c/118121
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26321}

media/engine/webrtc_video_engine_unittest.cc

diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc
index fc95a7e..5ebe647 100644
--- a/media/engine/webrtc_video_engine_unittest.cc
+++ b/media/engine/webrtc_video_engine_unittest.cc
@@ -3250,6 +3250,10 @@
   TestCpuAdaptation(false, false);
 }
 
+TEST_F(WebRtcVideoChannelTest, DoesNotAdaptWhenScreeensharing) {
+  TestCpuAdaptation(false, true);
+}
+
 TEST_F(WebRtcVideoChannelTest, DoesNotAdaptOnOveruseWhenScreensharing) {
   TestCpuAdaptation(true, true);
 }
@@ -3369,7 +3373,6 @@
   if (!enable_overuse) {
     EXPECT_FALSE(send_stream->resolution_scaling_enabled());
     EXPECT_FALSE(send_stream->framerate_scaling_enabled());
-    EXPECT_EQ(is_screenshare, send_stream->framerate_scaling_enabled());
 
     EXPECT_TRUE(capturer.CaptureFrame());
     EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames());