Fix device selection

src/js/bandwidth_test.js

@@ -146,10 +146,8 @@ function VideoBandwidthTest(test) {
   this.constraints = {
     audio: false,
     video: {
-      optional: [
-        {minWidth: 1280},
-        {minHeight: 720}
-      ]
+      minWidth: 1280,
+      minHeight: 720
     }
   };
 }

src/js/camresolutionstest.js

@@ -68,31 +68,32 @@ CamResolutionsTest.prototype = {
         height: {exact: resolution[1]}
       }
     };
-    navigator.mediaDevices.getUserMedia(constraints)
-        .then(function(stream) {
-          // Do not check actual video frames when more than one resolution is
-          // provided.
-          if (this.resolutions.length > 1) {
-            this.test.reportSuccess('Supported: ' + resolution[0] + 'x' +
-            resolution[1]);
-            stream.getTracks().forEach(function(track) {
-              track.stop();
-            });
-            this.maybeContinueGetUserMedia();
-          } else {
-            this.collectAndAnalyzeStats_(stream, resolution);
-          }
-        }.bind(this))
-        .catch(function(error) {
-          if (this.resolutions.length > 1) {
-            this.test.reportInfo(resolution[0] + 'x' + resolution[1] +
+
+    doGetUserMedia(constraints, onSuccess.bind(this), onFail.bind(this));
+
+    function onSuccess(stream) {
+      if (this.resolutions.length > 1) {
+	    this.test.reportSuccess('Supported: ' + resolution[0] + 'x' +
+		  resolution[1]);
+	      stream.getTracks().forEach(function(track) {
+		track.stop();
+	      });
+	      this.maybeContinueGetUserMedia();
+	    } else {
+	      this.collectAndAnalyzeStats_(stream, resolution);
+	    }
+    };
+
+    function onFail(error) {
+      if (this.resolutions.length > 1) {
+        this.test.reportInfo(resolution[0] + 'x' + resolution[1] +
             ' not supported');
-          } else {
-            this.test.reportError('getUserMedia failed with error: ' +
-                error.name);
-          }
-          this.maybeContinueGetUserMedia();
-        }.bind(this));
+      } else {
+        this.test.reportError('getUserMedia failed with error: ' + 
+            error);
+      }
+      this.maybeContinueGetUserMedia();
+    };
   },
 
   maybeContinueGetUserMedia: function() {
@@ -102,6 +103,31 @@ CamResolutionsTest.prototype = {
     }
     this.startGetUserMedia(this.resolutions[this.currentResolution++]);
   },
+
+  onSuccess: function(stream) {
+    if (this.resolutions.length > 1) {
+      this.test.reportSuccess('Supported: ' + resolution[0] + 'x' +
+          resolution[1]);
+      stream.getTracks().forEach(function(track) {
+        track.stop();
+      });
+      this.maybeContinueGetUserMedia();
+    } else {
+      this.collectAndAnalyzeStats_(stream, resolution);
+    }
+  },
+
+  onFail: function(error) {
+    if (this.resolutions.length > 1) {
+      this.test.reportInfo(resolution[0] + 'x' + resolution[1] +
+          ' not supported');
+    } else {
+      this.test.reportError('getUserMedia failed with error: ' + 
+          error.name);
+    }
+    this.maybeContinueGetUserMedia();
+  },
+
 
   collectAndAnalyzeStats_: function(stream, resolution) {
     var tracks = stream.getVideoTracks();

src/js/mictest.js

@@ -21,9 +21,7 @@ function MicTest(test) {
   // Turning off echoCancellation constraint enables stereo input.
   this.constraints = {
     audio: {
-      optional: [
-        {echoCancellation: false}
-      ]
+     echoCancellation: false 
     }
   };
 

src/ui/testrtc-main.html

@@ -206,13 +206,8 @@ <h3>STUN</h3>
       },
 
       appendSourceId: function(id, type, constraints) {
-        if (constraints[type] === true) {
-          constraints[type] = {optional: [{sourceId: id}]};
-        } else if (typeof constraints[type] === 'object') {
-          if (typeof constraints[type].optional === 'undefined') {
-            constraints[type].optional = [];
-          }
-          constraints[type].optional.push({sourceId: id});
+        if (constraints[type] !== false && typeof(constraints[type]) !== 'undefined') {
+          constraints[type]['deviceId'] =  id;
         }
       },