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 20 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().
  */

[phoglund_chromium, 2013/03/22 15:07:18]

This gets called from the browser tests and PyAuto tests, so you need to update
those too - otherwise all our automated tests will break. It's unfortunate that
this function happened to be called the same as in adapter.js. Fortunately the
code is well factorized so you only need to change in a handful of places.

So you'll need to change to doGetUserMedia in the following places:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/med...
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/test/functi...
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/test/functi...
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/test/functi...

[elham1, 2013/03/25 21:58:23]

Okay, I will upload a seperate cl for that.
On 2013/03/22 15:07:18, phoglund wrote:

[kjellander_chromium, 2013/03/26 06:46:10]

I think it's better to include these changes in this CL, as it's the same
codebase. That way we'll avoid unnecessary test breakages.

On 2013/03/25 21:58:23, elham1 wrote:

-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,

[phoglund_chromium, 2013/03/22 15:07:18]

Nit: indentation

[elham1, 2013/03/25 21:58:23]

Done.

+                       getUserMediaOkCallback_,
+                       getUserMediaFailedCallback_);
   returnToTest('ok-requested');
 }
 
 /**
- * Must be called after calling getUserMedia. Returns not-called-yet if we have
- * 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.
+ * Must be called after calling doGetUserMedia. Returns not-called-yet if we 

[phoglund_chromium, 2013/03/22 15:07:18]

Nit: lines should not end with whitespace. Configure your text editor to do this
for you.

[elham1, 2013/03/25 21:58:23]

Done.

+ * have 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;
 }
 
 /**
  * Stops the local stream.
  */
 function stopLocalStream() {
@@ skipping 49 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) {

[phoglund_chromium, 2013/03/22 15:07:18]

Nit: line length

[elham1, 2013/03/25 21:58:23]

Done.

-  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);
 };