From 0f07890c7eeb6e02d33675d391654a12be60c871 Mon Sep 17 00:00:00 2001
From: Dave Tapuska <dtapuska@chromium.org>
Date: Thu, 2 Aug 2018 09:03:30 +0000
Subject: [PATCH] Bug 1479041 [wpt PR 12212] - Move the transfer object into
 WindowPostMessageOptions, a=testonly

Automatic update from web-platform-testsMove the transfer object into WindowPostMessageOptions

Spec changes were requested and this change matches the spec changes.
https://github.com/whatwg/html/issues/3799

BUG=861735

Change-Id: Ie5f33e6d52eb5d904ae3c439ee488ab75a3b514d
Reviewed-on: https://chromium-review.googlesource.com/1151388
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Mustaq Ahmed <mustaq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579152}

--

wpt-commits: defe19d91c59decb804193cbc0137e6a8465367a
wpt-pr: 12212
---
 testing/web-platform/meta/MANIFEST.json       | 42 +++++--------------
 .../with-options/broken-origin.tentative.html |  2 +-
 .../host-specific-origin.tentative.html       |  2 +-
 .../with-options/invalid-args.tentative.html  | 10 -----
 ...essage-channel-transferable.tentative.html |  2 +-
 .../no-target-origin.tentative.html           |  2 +-
 ...tive.html => null-transfer.tentative.html} |  4 +-
 .../with-options/slash-origin.tentative.html  |  2 +-
 .../with-options/two-arg.tentative.html       | 14 -------
 .../undefined-transferable.tentative.html     |  2 +-
 .../unknown-parameter.tentative.html          |  2 +-
 11 files changed, 20 insertions(+), 64 deletions(-)
 delete mode 100644 testing/web-platform/tests/webmessaging/with-options/invalid-args.tentative.html
 rename testing/web-platform/tests/webmessaging/with-options/{null-arg-two.tentative.html => null-transfer.tentative.html} (60%)
 delete mode 100644 testing/web-platform/tests/webmessaging/with-options/two-arg.tentative.html

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 86be355335938..f1de1fdd00809 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -392280,12 +392280,6 @@
      {}
     ]
    ],
-   "webmessaging/with-options/invalid-args.tentative.html": [
-    [
-     "/webmessaging/with-options/invalid-args.tentative.html",
-     {}
-    ]
-   ],
    "webmessaging/with-options/message-channel-transferable.tentative.html": [
     [
      "/webmessaging/with-options/message-channel-transferable.tentative.html",
@@ -392298,9 +392292,9 @@
      {}
     ]
    ],
-   "webmessaging/with-options/null-arg-two.tentative.html": [
+   "webmessaging/with-options/null-transfer.tentative.html": [
     [
-     "/webmessaging/with-options/null-arg-two.tentative.html",
+     "/webmessaging/with-options/null-transfer.tentative.html",
      {}
     ]
    ],
@@ -392316,12 +392310,6 @@
      {}
     ]
    ],
-   "webmessaging/with-options/two-arg.tentative.html": [
-    [
-     "/webmessaging/with-options/two-arg.tentative.html",
-     {}
-    ]
-   ],
    "webmessaging/with-options/undefined-transferable.tentative.html": [
     [
      "/webmessaging/with-options/undefined-transferable.tentative.html",
@@ -642338,27 +642326,23 @@
    "support"
   ],
   "webmessaging/with-options/broken-origin.tentative.html": [
-   "e4d28c8e40c1ae6d5e4be9047a4ea77e7eee2bcf",
+   "d6901a15a34a166a9db7a999dc99f4f43c60bcb8",
    "testharness"
   ],
   "webmessaging/with-options/host-specific-origin.tentative.html": [
-   "7e6d16199138167a98d51e274101b0f8f701ff86",
-   "testharness"
-  ],
-  "webmessaging/with-options/invalid-args.tentative.html": [
-   "b04918a0004e8c92963721a6d4ac585c5308f27f",
+   "5003bcc807c94404c42297a2ceb964eb38d5a1b9",
    "testharness"
   ],
   "webmessaging/with-options/message-channel-transferable.tentative.html": [
-   "f474286a79e11b7d1c701e75a20111f5c9c71e67",
+   "d42db10695af68ca0d3f8264d7f703352783ff9b",
    "testharness"
   ],
   "webmessaging/with-options/no-target-origin.tentative.html": [
-   "e11e49d86cd599cbabc622aa5231bd3f14536e49",
+   "517466cc4c3ee96ba82d2a27b38050bd2e0fbf53",
    "testharness"
   ],
-  "webmessaging/with-options/null-arg-two.tentative.html": [
-   "d344dc48ed8278526263331284c44e7a3ee03a1d",
+  "webmessaging/with-options/null-transfer.tentative.html": [
+   "72bebd1e38e8c5538ebaf24fe608048bed61d18d",
    "testharness"
   ],
   "webmessaging/with-options/one-arg.tentative.html": [
@@ -642366,19 +642350,15 @@
    "testharness"
   ],
   "webmessaging/with-options/slash-origin.tentative.html": [
-   "1c6691ae78a4f75ef935c19e91d32c36a0a91dcf",
-   "testharness"
-  ],
-  "webmessaging/with-options/two-arg.tentative.html": [
-   "ed0314adc61f5ad38dc049623fe0ccf10102e20c",
+   "8bfde73774d3974d893272df117643d48f01039e",
    "testharness"
   ],
   "webmessaging/with-options/undefined-transferable.tentative.html": [
-   "36c3fe3cee95d582ac946c8585e66d8afa5e96f0",
+   "a123b7d9bd843f61f6dcf09e4fcab77d80a27200",
    "testharness"
   ],
   "webmessaging/with-options/unknown-parameter.tentative.html": [
-   "adcd9bf08452854c5b6ad688434834e83e1fdcf9",
+   "de050e74f5e2b5c4a102a3b0be1a43c4c2219117",
    "testharness"
   ],
   "webmessaging/with-ports/001.html": [
diff --git a/testing/web-platform/tests/webmessaging/with-options/broken-origin.tentative.html b/testing/web-platform/tests/webmessaging/with-options/broken-origin.tentative.html
index e4d28c8e40c1a..d6901a15a34a1 100644
--- a/testing/web-platform/tests/webmessaging/with-options/broken-origin.tentative.html
+++ b/testing/web-platform/tests/webmessaging/with-options/broken-origin.tentative.html
@@ -6,7 +6,7 @@
 <script>
 test(function() {
   assert_throws('SYNTAX_ERR', function() {
-    postMessage('', [], {targetOrigin: 'http://foo bar'});
+    postMessage('', {targetOrigin: 'http://foo bar'});
   }, 'should have failed to resolve');
 });
 </script>
diff --git a/testing/web-platform/tests/webmessaging/with-options/host-specific-origin.tentative.html b/testing/web-platform/tests/webmessaging/with-options/host-specific-origin.tentative.html
index 7e6d161991381..5003bcc807c94 100644
--- a/testing/web-platform/tests/webmessaging/with-options/host-specific-origin.tentative.html
+++ b/testing/web-platform/tests/webmessaging/with-options/host-specific-origin.tentative.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
 async_test(function() {
-  postMessage('', [], {targetOrigin: location.protocol + '//' + location.host + '//'});
+  postMessage('', {targetOrigin: location.protocol + '//' + location.host + '//'});
   onmessage = this.step_func(function(e) {
     assert_equals(e.origin, location.protocol + '//' + location.host);
     this.done();
diff --git a/testing/web-platform/tests/webmessaging/with-options/invalid-args.tentative.html b/testing/web-platform/tests/webmessaging/with-options/invalid-args.tentative.html
deleted file mode 100644
index b04918a0004e8..0000000000000
--- a/testing/web-platform/tests/webmessaging/with-options/invalid-args.tentative.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<title>unknown parameter</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<script>
-test(function() {
-  assert_throws(new TypeError, () => postMessage('', '/', {targetOrigin: 'http://example.com'}));
-});
-</script>
diff --git a/testing/web-platform/tests/webmessaging/with-options/message-channel-transferable.tentative.html b/testing/web-platform/tests/webmessaging/with-options/message-channel-transferable.tentative.html
index f474286a79e11..d42db10695af6 100644
--- a/testing/web-platform/tests/webmessaging/with-options/message-channel-transferable.tentative.html
+++ b/testing/web-platform/tests/webmessaging/with-options/message-channel-transferable.tentative.html
@@ -6,7 +6,7 @@
 <script>
 async_test(function(t) {
   var channel = new MessageChannel();
-  postMessage('', [channel.port1, channel.port2], {targetOrigin: '*'});
+  postMessage('', {targetOrigin: '*', transfer: [channel.port1, channel.port2]});
   onmessage = t.step_func(function(e) {
     assert_equals(e.ports.length, 2);
     t.done();
diff --git a/testing/web-platform/tests/webmessaging/with-options/no-target-origin.tentative.html b/testing/web-platform/tests/webmessaging/with-options/no-target-origin.tentative.html
index e11e49d86cd59..517466cc4c3ee 100644
--- a/testing/web-platform/tests/webmessaging/with-options/no-target-origin.tentative.html
+++ b/testing/web-platform/tests/webmessaging/with-options/no-target-origin.tentative.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
 async_test(function() {
-  postMessage('', [], {});
+  postMessage('', {});
   onmessage = this.step_func(function(e) {
     assert_equals(e.data, '');
     this.done();
diff --git a/testing/web-platform/tests/webmessaging/with-options/null-arg-two.tentative.html b/testing/web-platform/tests/webmessaging/with-options/null-transfer.tentative.html
similarity index 60%
rename from testing/web-platform/tests/webmessaging/with-options/null-arg-two.tentative.html
rename to testing/web-platform/tests/webmessaging/with-options/null-transfer.tentative.html
index d344dc48ed827..72bebd1e38e8c 100644
--- a/testing/web-platform/tests/webmessaging/with-options/null-arg-two.tentative.html
+++ b/testing/web-platform/tests/webmessaging/with-options/null-transfer.tentative.html
@@ -1,10 +1,10 @@
 <!doctype html>
-<title>null arg two interpreted as null string</title>
+<title>null transfer</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
 <script>
 test(function(t) {
-  assert_throws(new SyntaxError, () => postMessage('', null));
+  assert_throws(new TypeError, () => postMessage('', {transfer: null}));
 });
 </script>
diff --git a/testing/web-platform/tests/webmessaging/with-options/slash-origin.tentative.html b/testing/web-platform/tests/webmessaging/with-options/slash-origin.tentative.html
index 1c6691ae78a4f..8bfde73774d39 100644
--- a/testing/web-platform/tests/webmessaging/with-options/slash-origin.tentative.html
+++ b/testing/web-platform/tests/webmessaging/with-options/slash-origin.tentative.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
 async_test(function() {
-  postMessage('', [], {targetOrigin: '/'});
+  postMessage('', {targetOrigin: '/'});
   onmessage = this.step_func(function(e) {
     assert_equals(e.data, '');
     this.done();
diff --git a/testing/web-platform/tests/webmessaging/with-options/two-arg.tentative.html b/testing/web-platform/tests/webmessaging/with-options/two-arg.tentative.html
deleted file mode 100644
index ed0314adc61f5..0000000000000
--- a/testing/web-platform/tests/webmessaging/with-options/two-arg.tentative.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<title>two argument</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<script>
-test(function() {
-  postMessage('', []);
-  onmessage = this.step_func(function(e) {
-    assert_equals(e.data, '');
-    this.done();
-  });
-});
-</script>
diff --git a/testing/web-platform/tests/webmessaging/with-options/undefined-transferable.tentative.html b/testing/web-platform/tests/webmessaging/with-options/undefined-transferable.tentative.html
index 36c3fe3cee95d..a123b7d9bd843 100644
--- a/testing/web-platform/tests/webmessaging/with-options/undefined-transferable.tentative.html
+++ b/testing/web-platform/tests/webmessaging/with-options/undefined-transferable.tentative.html
@@ -5,7 +5,7 @@
 <div id=log></div>
 <script>
 async_test(function() {
-  postMessage('', undefined);
+  postMessage('', {transfer: undefined});
   onmessage = this.step_func(function(e) {
     assert_array_equals(e.ports, []);
     this.done();
diff --git a/testing/web-platform/tests/webmessaging/with-options/unknown-parameter.tentative.html b/testing/web-platform/tests/webmessaging/with-options/unknown-parameter.tentative.html
index adcd9bf084528..de050e74f5e2b 100644
--- a/testing/web-platform/tests/webmessaging/with-options/unknown-parameter.tentative.html
+++ b/testing/web-platform/tests/webmessaging/with-options/unknown-parameter.tentative.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
 async_test(function() {
-  postMessage('', [], {someBogusParameterOnThisDictionary: 'food'});
+  postMessage('', {someBogusParameterOnThisDictionary: 'food'});
   onmessage = this.step_func(function(e) {
     assert_equals(e.data, '');
     this.done();