From ca3bede481b3c4e1510e19e0c816128307ef7dcb Mon Sep 17 00:00:00 2001
From: Chandan Padhi <c.padhi@samsung.com>
Date: Wed, 28 Feb 2018 02:40:43 -0800
Subject: [PATCH] getCapabilities() should not have range properties without
 valid values

This CL ensures that MediaStreamTrack.getCapabilities() does not have
range properties if they don't have a valid range.

Bug: 293292
Change-Id: I6f85086fb4af7e17faca069f76299a0256f1872d
Reviewed-on: https://chromium-review.googlesource.com/938983
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539778}
---
 ...ediaStreamTrack-getCapabilities.https.html | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html b/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html
index a60a2f58f9a06b..30f5d50079a8de 100644
--- a/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html
+++ b/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html
@@ -6,24 +6,13 @@
 <script src=/resources/testharnessreport.js></script>
 <script>
   promise_test(() => {
-  return navigator.mediaDevices.getUserMedia({audio: true})
+  return navigator.mediaDevices.getUserMedia({audio: true, video: true})
     .then(stream => {
-      var capabilities = stream.getAudioTracks()[0].getCapabilities();
-      assert_true(undefined !== capabilities.deviceId, "MediaTrackCapabilities's deviceId should exist.");
-      assert_true(undefined !== capabilities.echoCancellation, "MediaTrackCapabilities's echoCancellation should exist.");
-    });
-  });
-
-  promise_test(() => {
-  return navigator.mediaDevices.getUserMedia({video: true})
-    .then(stream => {
-      var capabilities = stream.getVideoTracks()[0].getCapabilities();
-      assert_true(undefined !== capabilities.deviceId, "MediaTrackCapabilities's deviceId should exist.");
-      assert_true(undefined !== capabilities.width, "MediaTrackCapabilities's width should exist.");
-      assert_true(undefined !== capabilities.height, "MediaTrackCapabilities's height should exist.");
-      assert_true(undefined !== capabilities.aspectRatio, "MediaTrackCapabilities's aspectRatio should exist.");
-      assert_true(undefined !== capabilities.frameRate, "MediaTrackCapabilities's frameRate should exist.");
-      assert_true(undefined !== capabilities.facingMode, "MediaTrackCapabilities's facingMode should exist.");
+      var audioCapabilities = stream.getAudioTracks()[0].getCapabilities();
+      var videoCapabilities = stream.getVideoTracks()[0].getCapabilities();
+      assert_true(undefined !== audioCapabilities.deviceId, "MediaTrackCapabilities's deviceId should exist for an audio track.");
+      assert_true(undefined !== audioCapabilities.echoCancellation, "MediaTrackCapabilities's echoCancellation should exist for an audio track.");
+      assert_true(undefined !== videoCapabilities.deviceId, "MediaTrackCapabilities's deviceId should exist for a video track.");
     });
   });
 </script>