Updated Chrome Test pages

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 21 matching lines @@
  * This function asks permission to use the webcam and mic from the browser. It
  * will return ok-requested to PyAuto. 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
  *     and optional constraints defined. The contents of this parameter depends
  *     on the WebRTC version. This should be JavaScript code that we eval().
  */
-function getUserMedia(constraints) {
-  if (!navigator.webkitGetUserMedia) {
+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 getUserMedia: constraints: ' + constraints);
-  navigator.webkitGetUserMedia(evaluatedConstraints,
-                               getUserMediaOkCallback_,
-                               getUserMediaFailedCallback_);
+  debug('Requesting doGetUserMedia: constraints: ' + constraints);
+  getUserMedia(evaluatedConstraints,
+                       getUserMediaOkCallback_,

[kjellander_chromium, 2013/03/15 09:14:06]

Fix indentation.

[elham1, 2013/03/21 22:36:27]

Done.

+                       getUserMediaFailedCallback_);
   returnToTest('ok-requested');
 }
 
 /**
- * Must be called after calling getUserMedia. Returns not-called-yet if we have
+ * Must be called after calling doGetUserMedia. Returns not-called-yet if we have

[kjellander_chromium, 2013/03/15 09:14:06]

80 chars line limit.

[elham1, 2013/03/21 22:36:27]

Done.

  * not yet been called back by WebRTC. Otherwise it returns either ok-got-stream
  * or failed-with-error-x (where x is the error code from the error callback)
  * depending on which callback got called by WebRTC.
  */
 function obtainGetUserMediaResult() {
   returnToTest(gRequestWebcamAndMicrophoneResult);
   return gRequestWebcamAndMicrophoneResult;
 }
 
 /**
@@ skipping 52 matching lines @@
 
 // Internals.
 
 /**
  * @private
  * @param {MediaStream} stream Media stream.
  */
 function getUserMediaOkCallback_(stream) {
   gLocalStream = stream;
   var videoTag = $('local-view');
-  videoTag.src = webkitURL.createObjectURL(stream);
-
+  attachMediaStream(videoTag, stream);
   // Due to crbug.com/110938 the size is 0 when onloadedmetadata fires.
   // videoTag.onloadedmetadata = updateVideoTagSize_('local-view');
   // Use setTimeout as a workaround for now.
   setTimeout(function() {updateVideoTagSize_('local-view')}, 500);
   gRequestWebcamAndMicrophoneResult = 'ok-got-stream';
 }
 
 /**
  * @private
  * @param {string} videoTagId The ID of the video tag to update.
  */
 function updateVideoTagSize_(videoTagId) {
   var videoTag = $(videoTagId);
   // Don't update if sizes are 0 (happens for Chrome M23).
   if (videoTag.videoWidth > 0 && videoTag.videoHeight > 0) {
     debug('Set video tag "' + videoTagId + '" width and height to ' +
       videoTag.videoWidth + 'x' + videoTag.videoHeight);
     videoTag.width = videoTag.videoWidth;
     videoTag.height = videoTag.videoHeight;
   }
 }
 
 /**
  * @private
  * @param {NavigatorUserMediaError} error Error containing details.
  */
 function getUserMediaFailedCallback_(error) {
-  debug('GetUserMedia FAILED: Maybe the camera is in use by another process?');
+  debug('doGetUserMedia FAILED: Maybe the camera is in use by another process?');
   gRequestWebcamAndMicrophoneResult = 'failed-with-error-' + error.code;
 }
 
 $ = function(id) {
   return document.getElementById(id);
 };