Disable automatic scaling in tests.

webrtc/media/base/videoengine_unittest.h

Index: webrtc/media/base/videoengine_unittest.h
diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index a571bbc4bf4a08ba058c0030bac30e33ecfa607b..7758c1e4add34bcd8f385f5ecf6599b112903ba5 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -82,7 +82,13 @@ class VideoMediaChannelTest : public testing::Test,
 
   virtual void SetUp() {
     engine_.Init();
-    channel_.reset(engine_.CreateChannel(call_.get(), cricket::MediaConfig(),
+    cricket::MediaConfig media_config;
+    // Disabling cpu overuse detection actually disables quality scaling too; it
+    // implies DegradationPreference kMaintainResolution. Automatic scaling
+    // needs to be disabled, otherwise, tests which check the size of received
+    // frames become flaky.
+    media_config.video.enable_cpu_overuse_detection = false;
+    channel_.reset(engine_.CreateChannel(call_.get(), media_config,
                                          cricket::VideoOptions()));
     channel_->OnReadyToSend(true);
     EXPECT_TRUE(channel_.get() != NULL);