summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 22:04:31 +0000
committerdavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 22:04:31 +0000
commita547aaf2985d1ca7fb619da57f11ee0a89d1a16f (patch)
tree1de4a878fb067a81499ab8e647ea25b20c06af6c /content/test
parentdc8b1cd41a13c81f6bac9e5cc69e73b91afa02df (diff)
downloadchromium_src-a547aaf2985d1ca7fb619da57f11ee0a89d1a16f.zip
chromium_src-a547aaf2985d1ca7fb619da57f11ee0a89d1a16f.tar.gz
chromium_src-a547aaf2985d1ca7fb619da57f11ee0a89d1a16f.tar.bz2
Use window.URL instead of window.webkitURL.
It was unprefixed back in Chrome 23. BUG=330691 TEST=no behavior change Review URL: https://codereview.chromium.org/121203002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/data/media/getusermedia.html4
-rw-r--r--content/test/data/media/peerconnection-call.html4
2 files changed, 4 insertions, 4 deletions
diff --git a/content/test/data/media/getusermedia.html b/content/test/data/media/getusermedia.html
index e848715..92037cf 100644
--- a/content/test/data/media/getusermedia.html
+++ b/content/test/data/media/getusermedia.html
@@ -71,7 +71,7 @@
function plugStreamIntoLocalView(stream) {
gLocalStream = stream;
- var localStreamUrl = webkitURL.createObjectURL(stream);
+ var localStreamUrl = URL.createObjectURL(stream);
$('local-view').src = localStreamUrl;
}
@@ -100,7 +100,7 @@
expectEquals(new_stream.getAudioTracks().length, 0);
}
- var newStreamUrl = webkitURL.createObjectURL(new_stream);
+ var newStreamUrl = URL.createObjectURL(new_stream);
$('local-view').src = newStreamUrl;
waitForVideo('local-view');
}
diff --git a/content/test/data/media/peerconnection-call.html b/content/test/data/media/peerconnection-call.html
index a8b6555..0cfe6e97 100644
--- a/content/test/data/media/peerconnection-call.html
+++ b/content/test/data/media/peerconnection-call.html
@@ -535,7 +535,7 @@
}
function displayAndRemember(localStream) {
- var localStreamUrl = webkitURL.createObjectURL(localStream);
+ var localStreamUrl = URL.createObjectURL(localStream);
$('local-view').src = localStreamUrl;
gLocalStream = localStream;
@@ -746,7 +746,7 @@
return;
}
gRemoteStreams[target] = e.stream;
- var remoteStreamUrl = webkitURL.createObjectURL(e.stream);
+ var remoteStreamUrl = URL.createObjectURL(e.stream);
var remoteVideo = $(target);
remoteVideo.src = remoteStreamUrl;
}