Updated Chrome Test pages

getusermedia.js

Index: getusermedia.js
===================================================================
--- getusermedia.js	(revision 188159)
+++ getusermedia.js	(working copy)
@@ -39,8 +39,8 @@
  *     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;
   }
@@ -50,18 +50,18 @@
   } 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);
@@ -131,8 +131,7 @@
 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.
@@ -160,7 +159,7 @@
  * @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;
 }