Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Unified Diff: LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html

Issue 1314953010: Revert "Removal of mediaDevices.getUserMedia from insecure origins" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html
diff --git a/LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html b/LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html
index a37c622410ad6a915e524b0c2d65f551196e2770..b576eb641e26e82facc85f9026b1cc7bb7a61bb3 100644
--- a/LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html
+++ b/LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html
@@ -89,7 +89,7 @@ if (window.location.origin != get_host_info().UNAUTHENTICATED_ORIGIN) {
this.done();
}));
}, 'device orientation');
-
+
promise_test(function(test) {
return navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}]);
}, 'requestMediaKeySystemAccess');
@@ -97,18 +97,9 @@ if (window.location.origin != get_host_info().UNAUTHENTICATED_ORIGIN) {
// Tests for APIs that have been turned off on insecure origins
async_test(function() {
navigator.webkitGetUserMedia({ audio: true, video: true },
- this.unreached_func('navigator.webkitGetUserMedia should call the error callback, but called the success callback instead.'),
+ this.unreached_func('getUserMedia should call the error callback, but called the success callback instead.'),
this.step_func_done());
- }, 'navigator.webkitGetUserMedia');
-
- promise_test(function(test) {
- return navigator.mediaDevices.getUserMedia({audio: true, video: true}).then(
- test.unreached_func("navigator.mediaDevices.getUserMedia should reject the promise, but resolved instead."),
- function(error) {
- assert_equals(error.name, "NotSupportedError");
- assert_equals(error.message, "Only secure origins are allowed (see: https://goo.gl/Y0ZkNV).");
- });
- }, 'navigator.mediaDevices.getUserMedia');
+ }, 'getUserMedia');
}
</script>
</body>
« no previous file with comments | « no previous file | LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698