From 0ffd2f636f89f5829bc858377de8a1cdf0b6550b Mon Sep 17 00:00:00 2001
From: Jim Berlage <jberlage@mdsol.com>
Date: Mon, 5 Oct 2015 19:24:24 -0500
Subject: [PATCH] Require the argument to WebSocket#send() (fixes #7858).

---
 .../script/dom/webidls/WebSocket.webidl       |  2 +-
 components/script/dom/websocket.rs            |  4 ++--
 .../wpt/metadata/html/dom/interfaces.html.ini | 12 ----------
 .../metadata/websockets/interfaces.html.ini   | 24 -------------------
 .../interfaces/WebSocket/send/001.html.ini    |  5 ----
 .../mozilla/meta/mozilla/navigator.html.ini   |  4 +---
 6 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 tests/wpt/metadata/websockets/interfaces/WebSocket/send/001.html.ini

diff --git a/components/script/dom/webidls/WebSocket.webidl b/components/script/dom/webidls/WebSocket.webidl
index 9355b37dde1e..e2652a3716f5 100644
--- a/components/script/dom/webidls/WebSocket.webidl
+++ b/components/script/dom/webidls/WebSocket.webidl
@@ -28,7 +28,7 @@ interface WebSocket : EventTarget {
     //messaging
     attribute EventHandler onmessage;
     attribute BinaryType binaryType;
-    [Throws] void send(optional USVString data);
+    [Throws] void send(USVString data);
     //void send(Blob data);
     //void send(ArrayBuffer data);
     //void send(ArrayBufferView data);
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index b90cd53ff060..e58e23051e82 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -256,7 +256,7 @@ impl WebSocketMethods for WebSocket {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-websocket-send
-    fn Send(&self, data: Option<USVString>) -> Fallible<()> {
+    fn Send(&self, data: USVString) -> Fallible<()> {
         match self.ready_state.get() {
             WebSocketRequestState::Connecting => {
                 return Err(Error::InvalidState);
@@ -278,7 +278,7 @@ impl WebSocketMethods for WebSocket {
         */
         let mut other_sender = self.sender.borrow_mut();
         let my_sender = other_sender.as_mut().unwrap();
-        let _ = my_sender.lock().unwrap().send_message(Message::Text(data.unwrap().0));
+        let _ = my_sender.lock().unwrap().send_message(Message::Text(data.0));
         Ok(())
     }
 
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 066606a1e715..8d99f5813f8f 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -8739,18 +8739,6 @@
   [Location interface: window.location must have own property "reload"]
     expected: FAIL
 
-  [WebSocket interface: operation send(DOMString)]
-    expected: FAIL
-
-  [WebSocket interface: operation send(Blob)]
-    expected: FAIL
-
-  [WebSocket interface: operation send(ArrayBuffer)]
-    expected: FAIL
-
-  [WebSocket interface: operation send(ArrayBufferView)]
-    expected: FAIL
-
   [HTMLOptionElement must be primary interface of new Option()]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/websockets/interfaces.html.ini b/tests/wpt/metadata/websockets/interfaces.html.ini
index 2082bc52dffa..6868d95f0584 100644
--- a/tests/wpt/metadata/websockets/interfaces.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces.html.ini
@@ -15,18 +15,6 @@
   [WebSocket interface: attribute protocol]
     expected: FAIL
 
-  [WebSocket interface: operation send(DOMString)]
-    expected: FAIL
-
-  [WebSocket interface: operation send(Blob)]
-    expected: FAIL
-
-  [WebSocket interface: operation send(ArrayBuffer)]
-    expected: FAIL
-
-  [WebSocket interface: operation send(ArrayBufferView)]
-    expected: FAIL
-
   [Stringification of new WebSocket("ws://foo")]
     expected: FAIL
 
@@ -39,18 +27,6 @@
   [WebSocket interface: new WebSocket("ws://foo") must inherit property "protocol" with the proper type (11)]
     expected: FAIL
 
-  [WebSocket interface: calling send(DOMString) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [WebSocket interface: calling send(Blob) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [WebSocket interface: calling send(ArrayBuffer) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [WebSocket interface: calling send(ArrayBufferView) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
-    expected: FAIL
-
   [CloseEvent interface: existence and properties of interface object]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/001.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/send/001.html.ini
deleted file mode 100644
index 81dc9b1e553c..000000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/send/001.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[001.html]
-  type: testharness
-  [WebSockets: send() with no args]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/navigator.html.ini b/tests/wpt/mozilla/meta/mozilla/navigator.html.ini
index ade9b5819498..d5874aeb97c8 100644
--- a/tests/wpt/mozilla/meta/mozilla/navigator.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/navigator.html.ini
@@ -1,12 +1,10 @@
 [navigator.html]
   type: testharness
-
   [navigator.platform linux]
     expected:
       if os != "linux": FAIL
-      PASS
 
   [navigator.platform mac]
     expected:
       if os != "mac": FAIL
-      PASS
+