Spec compliant video constraints for getUserMedia behind flag.

content/browser/webrtc/webrtc_getusermedia_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/command_line.h"
+#include "base/feature_list.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
 #include "content/browser/webrtc/webrtc_internals.h"
+#include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "media/audio/audio_manager.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/perf/perf_test.h"
 
 #if defined(OS_WIN)
@@ skipping 58 matching lines @@
   const std::string video_constraint =
       "video: { mandatory: { chromeMediaSource:'screen' }}";
   return function_name + "({" + audio_constraint + video_constraint + "});";
 }
 
 bool VerifyDisableLocalEcho(bool expect_value,
                             const content::StreamControls& controls) {
   return expect_value == controls.disable_local_echo;
 }
 
+bool IsOldVideoConstraints() {
+  return base::FeatureList::IsEnabled(
+      features::kMediaStreamOldVideoConstraints);
+}
+
 }  // namespace
 
 namespace content {
 
 class WebRtcGetUserMediaBrowserTest : public WebRtcContentBrowserTestBase {
  public:
   WebRtcGetUserMediaBrowserTest() : trace_log_(NULL) {
     // Automatically grant device permission.
     AppendUseFakeUIForMediaStreamFlag();
   }
@@ skipping 381 matching lines @@
   const std::string& constraints2 = constraints1;
   std::string expected_result = "w=640:h=480-w=640:h=480";
 
   RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
                                                   expected_result);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        TwoGetUserMediaWithSecondVideoCropped) {
   std::string constraints1 = "{video: true}";
-  std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}";
+  std::string constraints2 =
+      IsOldVideoConstraints()
+          ? "{video: {mandatory: {maxHeight: 360}}}"
+          : "{video: {width: {exact: 640}, height: {exact: 360}}}";
   std::string expected_result = "w=640:h=480-w=640:h=360";
   RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
                                                   expected_result);
 }
 
 // Test fails under MSan, http://crbug.com/445745
 #if defined(MEMORY_SANITIZER)
 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
   DISABLED_TwoGetUserMediaWithFirstHdSecondVga
 #else
 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
   TwoGetUserMediaWithFirstHdSecondVga
 #endif
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        MAYBE_TwoGetUserMediaWithFirstHdSecondVga) {
   std::string constraints1 =
-      "{video: {mandatory: {maxWidth:1280 , minWidth:1280 , maxHeight: 720,\
-      minHeight: 720}}}";
+      IsOldVideoConstraints()
+          ? "{video: {mandatory: {maxWidth:1280 , minWidth:1280 , "
+            "maxHeight: 720, minHeight: 720}}}"
+          : "{video: {width : {exact: 1280}, height: {exact: 720}}}";
   std::string constraints2 =
-      "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
+      IsOldVideoConstraints()
+          ? "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}"
+          : "{video: {width : {exact: 640}, height: {exact: 480}}}";
   std::string expected_result = "w=1280:h=720-w=640:h=480";
   RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
                                                   expected_result);

[hbos_chromium, 2017/04/05 12:37:27]

ScopedFeature thingy to test both old and new with TEST_P?

[Guido Urdaneta, 2017/04/05 16:17:16]

Done.

 }
 
 // Timing out on Windows 7 bot: http://crbug.com/443294
 // Flaky: http://crbug.com/660656; possible the test is too perf sensitive.
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        DISABLED_TwoGetUserMediaWithFirst1080pSecondVga) {
   std::string constraints1 =
-      "{video: {mandatory: {maxWidth:1920 , minWidth:1920 , maxHeight: 1080,\
-      minHeight: 1080}}}";
+      "{video: {mandatory: {maxWidth:1920 , minWidth:1920 , maxHeight: 1080, "
+      "minHeight: 1080}}}";
   std::string constraints2 =
       "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
   std::string expected_result = "w=1920:h=1080-w=640:h=480";
   RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
                                                   expected_result);
 }
 
 // Test fails under MSan, http://crbug.com/445745
 #if defined(MEMORY_SANITIZER)
 #define MAYBE_TwoGetUserMediaAndVerifyFrameRate \
@@ skipping 236 matching lines @@
       base::Bind(&VerifyDisableLocalEcho, true));
   call = GenerateGetUserMediaWithDisableLocalEcho(
       "getUserMediaAndExpectSuccess", "true");
   ExecuteJavascriptAndWaitForOk(call);
 
   manager->SetGenerateStreamCallbackForTesting(
       MediaStreamManager::GenerateStreamTestCallback());
 }
 
 }  // namespace content