Updated Chrome Test pages

manual/constraints.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.
  */
 
 /**
  * Asks permission to use the webcam and mic from the browser.
  */
-function getUserMedia() {
+function doGetUserMedia() {
+  // Call into getUserMedia via the polyfill (adapter.js).
   var constraints = getConstraints_();
   var constraintsString = JSON.stringify(constraints, null, ' ');
   $('getusermedia-constraints').innerHTML = constraintsString;
-  if (!navigator.webkitGetUserMedia) {
+  if (!getUserMedia) {
     log_('Browser does not support WebRTC.');
     return;
   }
   log_('Requesting getUserMedia with constraints: ' + constraintsString);
-  navigator.webkitGetUserMedia(constraints,
-                               getUserMediaOkCallback_,
-                               getUserMediaFailedCallback_);
+  getUserMedia(constraints,
+                       getUserMediaOkCallback_,

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

Fix indentation.

+                       getUserMediaFailedCallback_);
 }
 
 // Internals
 
 /**
  * Builds a Javascript constraints dictionary out of the selected options in the
  * HTML controls on the page.
  * @private
  * @return {Object} A dictionary of constraints.
  */
@@ skipping 60 matching lines @@
   return c;
 }
 
 /**
  * @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_(videoTag);
   // Use setTimeout as a workaround for now.
   setTimeout(function() {updateVideoTagSize_(videoTag)}, 500);
   gRequestWebcamAndMicrophoneResult = 'ok-got-stream';
 }
 
 /**
  * @private
  * @param {Object} videoTag The video tag to update.
@@ skipping 22 matching lines @@
 
 /**
  * Simple logging function.
  * @private
  * @param {string} message Message to print.
  */
 function log_(message) {
   console.log(message);
   $('messages').innerHTML += message + '<br>';
 }