summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiman <piman@chromium.org>2016-03-23 15:50:57 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-23 22:52:46 +0000
commitbc0204c06028b7df9a97df02848b730193b64534 (patch)
treecf93a5345d693c9c1f9b6811ae2a1e424f5657fa
parent9b8d9b61d68ace4ba8a70dd8f06f3e4bd54fdc76 (diff)
downloadchromium_src-bc0204c06028b7df9a97df02848b730193b64534.zip
chromium_src-bc0204c06028b7df9a97df02848b730193b64534.tar.gz
chromium_src-bc0204c06028b7df9a97df02848b730193b64534.tar.bz2
Move fast/frames layout tests that require plugins to ppapi
BUG=318978, 474535 Review URL: https://codereview.chromium.org/1833503002 Cr-Commit-Position: refs/heads/master@{#382959}
Diffstat
-rw-r--r--third_party/WebKit/LayoutTests/TestExpectations2
-rw-r--r--third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash-expected.txt1
-rw-r--r--third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html2
-rw-r--r--third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-embed.html2
-rw-r--r--third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-object.html4
-rw-r--r--third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed-expected.txt5
-rw-r--r--third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html4
-rw-r--r--third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins-expected.txt10
-rw-r--r--third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html8
9 files changed, 20 insertions, 18 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index e12c065..e0fb181 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -579,8 +579,6 @@ crbug.com/517840 imported/web-platform-tests/webrtc/rtcpeerconnection/rtcpeercon
# Linux Aura doesn't support NPAPI plugins (yet?)
crbug.com/318978 [ Linux ] compositing/plugins/invalidate_rect.html [ Skip ]
-crbug.com/318978 [ Linux ] fast/frames/sandboxed-iframe-navigation-allowed.html [ Skip ]
-crbug.com/318978 [ Linux ] fast/frames/sandboxed-iframe-plugins.html [ Skip ]
crbug.com/318978 [ Linux ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-child.html [ Skip ]
crbug.com/318978 [ Linux ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid.html [ Skip ]
crbug.com/318978 [ Linux ] http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01.html [ Skip ]
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash-expected.txt b/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash-expected.txt
index 7ef22e9..f7a66c6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash-expected.txt
@@ -1 +1,2 @@
+CONSOLE MESSAGE: Blink Test Plugin: initializing
PASS
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html
index cdcc939..b5fa05a 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-plugin-load-remove-document-crash.html
@@ -15,7 +15,7 @@
testRunner.notifyDone();
}
</script>
-<iframe src="data:application/x-webkit-test-netscape,foo"></iframe>
+<iframe src="data:application/x-blink-test-plugin,foo"></iframe>
</body>
</html>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-embed.html b/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-embed.html
index 500ed7c..f949398 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-embed.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-embed.html
@@ -4,7 +4,7 @@
<body>
<embed id="plugin"
- type="application/x-webkit-test-netscape"
+ type="application/x-blink-test-plugin"
src="data:text/plain,"
style="width:0; height:0">
</embed>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-object.html b/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-object.html
index d7248cf..937a481 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-object.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/resources/sandboxed-iframe-plugins-frame-object.html
@@ -3,8 +3,8 @@
</head>
<body>
- <object id="plugin"
- type="application/x-webkit-test-netscape"
+ <object id="plugin"
+ type="application/x-blink-test-plugin"
style="width:0; height:0">
</object>
</body>
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed-expected.txt b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed-expected.txt
index 2aa7e95..3e65889 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed-expected.txt
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: Blink Test Plugin: initializing
CONSOLE ERROR: Failed to load '' as a plugin, because the frame into which the plugin is loading is sandboxed.
This test verifies that a sandboxed iframe CAN navigate both itself and a child in the frame tree. It also verifies that the sandbox attribute remains intact after a frame has been navigated, and that sandbox attributes are propagated through the frame hierarchy.
@@ -7,8 +8,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
TEST COMPLETE
-PASS (self.sandboxedFrame.frameWithPlugin.document.getElementById('plugin').destroyStream) == undefined is true
-PASS (self.frameWithPlugin.document.getElementById('plugin').destroyStream) != undefined is true
+PASS (self.sandboxedFrame.frameWithPlugin.document.getElementById('plugin').postMessage) == undefined is true
+PASS (self.frameWithPlugin.document.getElementById('plugin').postMessage) != undefined is true
PASS document.getElementById('sandboxedFrameId').sandbox is ['allow-scripts', 'allow-same-origin']
PASS document.getElementById('sandboxedFrameId').getAttribute('sandbox') is 'allow-scripts'
PASS successfullyParsed is true
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html
index 9c65778..c89b9fe 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-navigation-allowed.html
@@ -11,11 +11,11 @@ if (window.testRunner) {
function childFrameWasNavigated()
{
// Check that the child frame was unable to load a plugin, since its parent is sandboxed.
- shouldBeTrue("(self.sandboxedFrame.frameWithPlugin.document.getElementById('plugin').destroyStream) == undefined");
+ shouldBeTrue("(self.sandboxedFrame.frameWithPlugin.document.getElementById('plugin').postMessage) == undefined");
// Check a non-sandboxed frame as well, to ensure that the plugin is disabled by sandboxing
// and not some other failure
- shouldBeTrue("(self.frameWithPlugin.document.getElementById('plugin').destroyStream) != undefined");
+ shouldBeTrue("(self.frameWithPlugin.document.getElementById('plugin').postMessage) != undefined");
// When the child frame (grandchild of the main window) has been navigated,
// make the sandboxed frame navigate itself
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins-expected.txt b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins-expected.txt
index 7ad5f70..3350e44 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins-expected.txt
@@ -1,4 +1,6 @@
+CONSOLE MESSAGE: Blink Test Plugin: initializing
CONSOLE ERROR: Failed to load 'data:text/plain,' as a plugin, because the frame into which the plugin is loading is sandboxed.
+CONSOLE MESSAGE: Blink Test Plugin: initializing
CONSOLE ERROR: Failed to load '' as a plugin, because the frame into which the plugin is loading is sandboxed.
This test verifies that sandboxing of plugins works as intended. Two tests are made, each in one sandboxed and one non-sandboxed IFrame: embeds and objects.
@@ -8,10 +10,10 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
TEST COMPLETE
-PASS (self.embedFrame1.document.getElementById('plugin').destroyStream) != undefined is true
-PASS (self.embedFrame2.document.getElementById('plugin').destroyStream) == undefined is true
-PASS (self.objectFrame1.document.getElementById('plugin').destroyStream) != undefined is true
-PASS (self.objectFrame2.document.getElementById('plugin').destroyStream) == undefined is true
+PASS (self.embedFrame1.document.getElementById('plugin').postMessage) != undefined is true
+PASS (self.embedFrame2.document.getElementById('plugin').postMessage) == undefined is true
+PASS (self.objectFrame1.document.getElementById('plugin').postMessage) != undefined is true
+PASS (self.objectFrame2.document.getElementById('plugin').postMessage) == undefined is true
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html
index a5fb977..a38d53a 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/sandboxed-iframe-plugins.html
@@ -6,11 +6,11 @@ if (window.testRunner)
testRunner.dumpAsText();
window.onload = function() {
- shouldBeTrue("(self.embedFrame1.document.getElementById('plugin').destroyStream) != undefined");
- shouldBeTrue("(self.embedFrame2.document.getElementById('plugin').destroyStream) == undefined");
+ shouldBeTrue("(self.embedFrame1.document.getElementById('plugin').postMessage) != undefined");
+ shouldBeTrue("(self.embedFrame2.document.getElementById('plugin').postMessage) == undefined");
- shouldBeTrue("(self.objectFrame1.document.getElementById('plugin').destroyStream) != undefined");
- shouldBeTrue("(self.objectFrame2.document.getElementById('plugin').destroyStream) == undefined");
+ shouldBeTrue("(self.objectFrame1.document.getElementById('plugin').postMessage) != undefined");
+ shouldBeTrue("(self.objectFrame2.document.getElementById('plugin').postMessage) == undefined");
isSuccessfullyParsed();
}
generated by cgit v1.1 at 2025-12-01 06:45:25 +0000