Cleaned up WebRTC browser test js, removed unneeded stuff.

chrome/test/data/webrtc/getusermedia.js

 /**
  * Copyright (c) 2012 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.
  */
 
 /**
  * See http://dev.w3.org/2011/webrtc/editor/getusermedia.html for more
  * information on getUserMedia.
  */
@@ skipping 27 matching lines @@
   return document.getElementById(id);
 };
 
 /**
  * This function asks permission to use the webcam and mic from the browser. It
  * will return ok-requested to the test. This does not mean the request was
  * approved though. The test will then have to click past the dialog that
  * appears in Chrome, which will run either the OK or failed callback as a
  * a result. To see which callback was called, use obtainGetUserMediaResult().
  *
- * @param {string} constraints Defines what to be requested, with mandatory
+ * @param {!object} constraints Defines what to be requested, with mandatory

[kjellander_chromium, 2014/05/26 14:30:47]

nit: Object starting with uppercase according to
http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml?showone...

same below.

[phoglund_chromium, 2014/05/27 09:29:44]

Done.

  *     and optional constraints defined. The contents of this parameter depends
- *     on the WebRTC version. This should be JavaScript code that we eval().
+ *     on the WebRTC version.
  */
 function doGetUserMedia(constraints) {
   if (!getUserMedia) {
     returnToTest('Browser does not support WebRTC.');
     return;
   }
-  try {
-    var evaluatedConstraints;
-    eval('evaluatedConstraints = ' + constraints);
-  } catch (exception) {
-    throw failTest('Not valid JavaScript expression: ' + constraints);
-  }
   debug('Requesting doGetUserMedia: constraints: ' + constraints);
-  getUserMedia(evaluatedConstraints,
+  getUserMedia(constraints,
                function(stream) {
                  ensureGotAllExpectedStreams_(stream, constraints);
                  getUserMediaOkCallback_(stream);
                },
                getUserMediaFailedCallback_);
   returnToTest('ok-requested');
 }
 
 /**
  * Must be called after calling doGetUserMedia.
@@ skipping 49 matching lines @@
  * @return {string} Returns the current local stream - |gLocalStream|.
  */
 function getLocalStream() {
   return gLocalStream;
 }
 
 // Internals.
 
 /**
  * @private
- * @param {MediaStream} stream Media stream from getUserMedia.
- * @param {String} constraints The constraints passed
+ * @param {!MediaStream} stream Media stream from getUserMedia.
+ * @param {!object} constraints The getUserMedia constraints object.
  */
 function ensureGotAllExpectedStreams_(stream, constraints) {
-  var requestedVideo = /video\s*:\s*true/i;
-  if (requestedVideo.test(constraints) && stream.getVideoTracks().length == 0) {
+  if (constraints['video'] && stream.getVideoTracks().length == 0) {
     gRequestWebcamAndMicrophoneResult = 'failed-to-get-video';
     throw ('Requested video, but did not receive a video stream from ' +
            'getUserMedia. Perhaps the machine you are running on ' +
            'does not have a webcam.');
   }
-  var requestedAudio = /audio\s*:\s*true/i;
-  if (requestedAudio.test(constraints) && stream.getAudioTracks().length == 0) {
+  if (constraints['audio'] && stream.getAudioTracks().length == 0) {
     gRequestWebcamAndMicrophoneResult = 'failed-to-get-audio';
     throw ('Requested audio, but did not receive an audio stream ' +
            'from getUserMedia. Perhaps the machine you are running ' +
            'on does not have audio devices.');
   }
 }
 
 /**
  * @private
  * @param {MediaStream} stream Media stream.
@@ skipping 10 matching lines @@
  * @param {NavigatorUserMediaError} error Error containing details.
  */
 function getUserMediaFailedCallback_(error) {
   // Translate from the old error to the new. Remove when rename fully deployed.
   var errorName = error.name;
 
   debug('GetUserMedia FAILED: Maybe the camera is in use by another process?');
   gRequestWebcamAndMicrophoneResult = 'failed-with-error-' + errorName;
   debug(gRequestWebcamAndMicrophoneResult);
 }