Index: Source/modules/websockets/DOMWebSocketTest.cpp |
diff --git a/Source/modules/websockets/DOMWebSocketTest.cpp b/Source/modules/websockets/DOMWebSocketTest.cpp |
index b9c97653fb310cf38ca62dd6c7aaab214c039a39..7049e6db7cbe753990e591cf1022b829e5d4287e 100644 |
--- a/Source/modules/websockets/DOMWebSocketTest.cpp |
+++ b/Source/modules/websockets/DOMWebSocketTest.cpp |
@@ -314,7 +314,7 @@ TEST_F(DOMWebSocketTest, maximumReasonSize) |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState()); |
- m_websocket->close(1000, reason, m_exceptionState); |
+ m_websocket->close(makeOptional(1000), reason, m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
@@ -334,7 +334,7 @@ TEST_F(DOMWebSocketTest, reasonSizeExceeding) |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState()); |
- m_websocket->close(1000, reason, m_exceptionState); |
+ m_websocket->close(makeOptional(1000), reason, m_exceptionState); |
EXPECT_TRUE(m_exceptionState.hadException()); |
EXPECT_EQ(SyntaxError, m_exceptionState.code()); |
@@ -354,7 +354,7 @@ TEST_F(DOMWebSocketTest, closeWhenConnecting) |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState()); |
- m_websocket->close(1000, "bye", m_exceptionState); |
+ m_websocket->close(makeOptional(1000), "bye", m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
@@ -374,7 +374,7 @@ TEST_F(DOMWebSocketTest, close) |
m_websocket->didConnect("", ""); |
EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState()); |
- m_websocket->close(3005, "bye", m_exceptionState); |
+ m_websocket->close(makeOptional(3005), "bye", m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
@@ -394,7 +394,7 @@ TEST_F(DOMWebSocketTest, closeWithoutReason) |
m_websocket->didConnect("", ""); |
EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState()); |
- m_websocket->close(3005, m_exceptionState); |
+ m_websocket->close(makeOptional(3005), String(), m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
@@ -414,7 +414,7 @@ TEST_F(DOMWebSocketTest, closeWithoutCodeAndReason) |
m_websocket->didConnect("", ""); |
EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState()); |
- m_websocket->close(m_exceptionState); |
+ m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
@@ -434,11 +434,11 @@ TEST_F(DOMWebSocketTest, closeWhenClosing) |
m_websocket->didConnect("", ""); |
EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState()); |
- m_websocket->close(m_exceptionState); |
+ m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
- m_websocket->close(m_exceptionState); |
+ m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
@@ -459,13 +459,13 @@ TEST_F(DOMWebSocketTest, closeWhenClosed) |
m_websocket->didConnect("", ""); |
EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState()); |
- m_websocket->close(m_exceptionState); |
+ m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
m_websocket->didClose(WebSocketChannelClient::ClosingHandshakeComplete, 1000, String()); |
EXPECT_EQ(DOMWebSocket::CLOSED, m_websocket->readyState()); |
- m_websocket->close(m_exceptionState); |
+ m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSED, m_websocket->readyState()); |
@@ -501,7 +501,7 @@ TEST_F(DOMWebSocketTest, sendStringWhenClosing) |
EXPECT_FALSE(m_exceptionState.hadException()); |
- m_websocket->close(m_exceptionState); |
+ m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
m_websocket->send("hello", m_exceptionState); |
@@ -581,7 +581,7 @@ TEST_F(DOMWebSocketTest, sendArrayBufferWhenClosing) |
EXPECT_FALSE(m_exceptionState.hadException()); |
- m_websocket->close(m_exceptionState); |
+ m_websocket->close(makeOptionalMissing<int>(), String(), m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
m_websocket->send(view->buffer().get(), m_exceptionState); |
@@ -678,7 +678,7 @@ TEST_P(DOMWebSocketValidClosingTest, test) |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState()); |
- m_websocket->close(GetParam(), "bye", m_exceptionState); |
+ m_websocket->close(makeOptional(GetParam()), "bye", m_exceptionState); |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
@@ -701,7 +701,7 @@ TEST_P(DOMWebSocketInvalidClosingCodeTest, test) |
EXPECT_FALSE(m_exceptionState.hadException()); |
EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState()); |
- m_websocket->close(GetParam(), "bye", m_exceptionState); |
+ m_websocket->close(makeOptional(GetParam()), "bye", m_exceptionState); |
EXPECT_TRUE(m_exceptionState.hadException()); |
EXPECT_EQ(InvalidAccessError, m_exceptionState.code()); |