Landing https://codereview.chromium.org/18769010/.

chrome/test/data/webrtc/manual/constraints.js

Index: chrome/test/data/webrtc/manual/constraints.js
diff --git a/chrome/test/data/webrtc/manual/constraints.js b/chrome/test/data/webrtc/manual/constraints.js
index f671b6bdf8fc426d83ce0d7881d48b8b8ff9dd37..4bc28a9f8019d986f156c89b9a8f0311a7c72400 100644
--- a/chrome/test/data/webrtc/manual/constraints.js
+++ b/chrome/test/data/webrtc/manual/constraints.js
@@ -12,18 +12,18 @@
 /**
  * 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_,
+               getUserMediaFailedCallback_);
 }
 
 // Internals
@@ -104,7 +104,7 @@ function getConstraints_() {
 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);