Remove support for old getUserMedia video constraints algorithm.

content/browser/webrtc/webrtc_getusermedia_browsertest.cc

Index: content/browser/webrtc/webrtc_getusermedia_browsertest.cc
diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
index 57b608b49e04121b7e0e69b8cfa006b2ff54a58f..3550c0c2f3c11f05fa0dd6faec3da8297107d322 100644
--- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
@@ -109,9 +109,8 @@ namespace content {
 class WebRtcGetUserMediaBrowserTest : public WebRtcContentBrowserTestBase {
  public:
   WebRtcGetUserMediaBrowserTest() : trace_log_(NULL) {
-    scoped_feature_list_.InitWithFeatures(
-        {}, {features::kMediaStreamOldVideoConstraints,
-             features::kMediaStreamOldAudioConstraints});
+    scoped_feature_list_.InitAndDisableFeature(
+        features::kMediaStreamOldAudioConstraints);
     // Automatically grant device permission.
     AppendUseFakeUIForMediaStreamFlag();
   }
@@ -806,10 +805,8 @@ class WebRtcGetUserMediaOldConstraintsBrowserTest
     : public WebRtcContentBrowserTestBase {
  public:
   WebRtcGetUserMediaOldConstraintsBrowserTest() : trace_log_(NULL) {
-    scoped_feature_list_.InitWithFeatures(
-        {features::kMediaStreamOldVideoConstraints,
-         features::kMediaStreamOldAudioConstraints},
-        {});
+    scoped_feature_list_.InitAndEnableFeature(
+        features::kMediaStreamOldAudioConstraints);
     // Automatically grant device permission.
     AppendUseFakeUIForMediaStreamFlag();
   }
@@ -1193,37 +1190,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest,
                                                   expected_result);
 }
 
-// TODO(guidou): Remove this test. http://crbug.com/706408
-IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest,
-                       TwoGetUserMediaWithSecondVideoCropped) {
-  std::string constraints1 = "{video: true}";
-  std::string constraints2 = "{video: {mandatory: {maxHeight: 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
-// TODO(guidou): Remove this test. http://crbug.com/706408
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
-  DISABLED_TwoGetUserMediaWithFirstHdSecondVga
-#else
-#define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
-  TwoGetUserMediaWithFirstHdSecondVga
-#endif
-IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest,
-                       MAYBE_TwoGetUserMediaWithFirstHdSecondVga) {
-  std::string constraints1 =
-      "{video: {mandatory: {maxWidth:1280 , minWidth:1280 , maxHeight: 720, "
-      "minHeight: 720}}}";
-  std::string constraints2 =
-      "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
-  std::string expected_result = "w=1280:h=720-w=640:h=480";
-  RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
-                                                  expected_result);
-}
-
 // 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(WebRtcGetUserMediaOldConstraintsBrowserTest,