Index: third_party/WebKit/LayoutTests/external/wpt/clear-site-data/navigation-insecure.html |
diff --git a/third_party/WebKit/LayoutTests/external/wpt/clear-site-data/navigation.https.html b/third_party/WebKit/LayoutTests/external/wpt/clear-site-data/navigation-insecure.html |
similarity index 50% |
copy from third_party/WebKit/LayoutTests/external/wpt/clear-site-data/navigation.https.html |
copy to third_party/WebKit/LayoutTests/external/wpt/clear-site-data/navigation-insecure.html |
index e19fc9d3b936aa4eaaa8e76a74eb66308193870e..c156aa10fe882769ceddd7fa9e821cfc482aa300 100644 |
--- a/third_party/WebKit/LayoutTests/external/wpt/clear-site-data/navigation.https.html |
+++ b/third_party/WebKit/LayoutTests/external/wpt/clear-site-data/navigation-insecure.html |
@@ -8,63 +8,39 @@ |
<body> |
<script> |
- /** Ensures that all datatypes are nonempty. */ |
- function populateDatatypes() { |
- return Promise.all(TestUtils.DATATYPES.map(function(datatype) { |
- return new Promise(function(resolve, reject) { |
- datatype.add().then(function() { |
- datatype.isEmpty().then(function(isEmpty) { |
- assert_false( |
- isEmpty, |
- datatype.name + |
- " has to be nonempty before the test starts."); |
- resolve(); |
- }); |
- }); |
- }); |
- })); |
- } |
- |
/** |
* @param Array.<Array.<Datatype>> combination A combination of datatypes. |
* @param Dict.<string, boolean> report A map between a datatype name and |
* whether it is empty. |
- * @return boolean Whether all datatypes are empty if and only if they are |
- * included in the |combination|. |
+ * @return boolean Whether all datatypes are still nonempty. |
*/ |
- function verifyDatatypes(combination, report) { |
+ function verifyDatatypes(report) { |
TestUtils.DATATYPES.forEach(function(datatype) { |
- if (combination.indexOf(datatype) != -1) { |
- assert_true( |
- report[datatype.name], |
- datatype.name + " should have been cleared."); |
- } else { |
- assert_false( |
- report[datatype.name], |
- datatype.name + " should NOT have been cleared."); |
- } |
+ assert_false( |
+ report[datatype.name], |
+ datatype.name + " should NOT have been cleared."); |
}); |
} |
TestUtils.COMBINATIONS.forEach(function(combination) { |
var test_name = |
- "Clear datatypes on navigation: " + |
- combination.map(function(e) { return e.name; }).join(", "); |
+ "Do not clear datatypes on insecure navigation (header: " + |
+ combination.map(function(e) { return e.name; }).join(", ") + |
+ ")"; |
promise_test(function(test) { |
return new Promise(function(resolve_test, reject_test) { |
- populateDatatypes() |
+ TestUtils.populateDatatypes() |
.then(function() { |
// Navigate to a resource with a Clear-Site-Data header in |
- // an iframe, then verify that the correct types have been |
- // deleted. |
+ // an iframe, then verify that no data have been deleted. |
return new Promise(function(resolve, reject) { |
window.addEventListener("message", resolve); |
var iframe = document.createElement("iframe"); |
iframe.src = TestUtils.getClearSiteDataUrl(combination); |
document.body.appendChild(iframe); |
}).then(function(messageEvent) { |
- verifyDatatypes(combination, messageEvent.data); |
+ verifyDatatypes(messageEvent.data); |
resolve_test(); |
}); |
}); |