Chromium Code Reviews| Index: third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp |
| diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp |
| index 9c18c91d463d966261add7bc360eb946c3c6d13d..b68bba5ae75bc2807e1c5330a4027d46576a9085 100644 |
| --- a/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp |
| +++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp |
| @@ -599,7 +599,7 @@ TEST_F(DOMWebSocketTest, sendNonLatin1String) |
| TEST_F(DOMWebSocketTest, sendArrayBufferWhenConnecting) |
| { |
| - RefPtr<DOMArrayBufferView> view = DOMUint8Array::create(8); |
| + RefPtr<DOMArrayBufferView> view = DOMUint8Array::deprecatedCreateOrCrash(8); |
| { |
| InSequence s; |
| EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true)); |
| @@ -608,7 +608,9 @@ TEST_F(DOMWebSocketTest, sendArrayBufferWhenConnecting) |
| EXPECT_FALSE(m_exceptionState.hadException()); |
| - m_websocket->send(view->buffer().get(), m_exceptionState); |
| + RefPtr<DOMArrayBuffer> buffer = view->bufferOrNull(); |
| + RELEASE_ASSERT(buffer); // Out of memory? |
| + m_websocket->send(buffer.get(), m_exceptionState); |
| EXPECT_TRUE(m_exceptionState.hadException()); |
| EXPECT_EQ(InvalidStateError, m_exceptionState.code()); |
| @@ -618,7 +620,7 @@ TEST_F(DOMWebSocketTest, sendArrayBufferWhenConnecting) |
| TEST_F(DOMWebSocketTest, sendArrayBufferWhenClosing) |
| { |
| - RefPtr<DOMArrayBufferView> view = DOMUint8Array::create(8); |
| + RefPtr<DOMArrayBufferView> view = DOMUint8Array::deprecatedCreateOrCrash(8); |
| { |
| InSequence s; |
| EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true)); |
| @@ -631,7 +633,9 @@ TEST_F(DOMWebSocketTest, sendArrayBufferWhenClosing) |
| m_websocket->close(m_exceptionState); |
| EXPECT_FALSE(m_exceptionState.hadException()); |
| - m_websocket->send(view->buffer().get(), m_exceptionState); |
| + RefPtr<DOMArrayBuffer> buffer = view->bufferOrNull(); |
| + RELEASE_ASSERT(buffer); // Out of memory? |
| + m_websocket->send(buffer.get(), m_exceptionState); |
| EXPECT_FALSE(m_exceptionState.hadException()); |
| EXPECT_EQ(DOMWebSocket::CLOSING, m_websocket->readyState()); |
| @@ -640,7 +644,7 @@ TEST_F(DOMWebSocketTest, sendArrayBufferWhenClosing) |
| TEST_F(DOMWebSocketTest, sendArrayBufferWhenClosed) |
| { |
| Checkpoint checkpoint; |
| - RefPtr<DOMArrayBufferView> view = DOMUint8Array::create(8); |
| + RefPtr<DOMArrayBufferView> view = DOMUint8Array::deprecatedCreateOrCrash(8); |
| { |
| InSequence s; |
| EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true)); |
| @@ -654,7 +658,9 @@ TEST_F(DOMWebSocketTest, sendArrayBufferWhenClosed) |
| m_websocket->didClose(WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, ""); |
| checkpoint.Call(1); |
| - m_websocket->send(view->buffer().get(), m_exceptionState); |
| + RefPtr<DOMArrayBuffer> buffer = view->bufferOrNull(); |
| + RELEASE_ASSERT(buffer); // Out of memory? |
| + m_websocket->send(buffer.get(), m_exceptionState); |
| EXPECT_FALSE(m_exceptionState.hadException()); |
| EXPECT_EQ(DOMWebSocket::CLOSED, m_websocket->readyState()); |
| @@ -662,18 +668,22 @@ TEST_F(DOMWebSocketTest, sendArrayBufferWhenClosed) |
| TEST_F(DOMWebSocketTest, sendArrayBufferSuccess) |
| { |
| - RefPtr<DOMArrayBufferView> view = DOMUint8Array::create(8); |
| + RefPtr<DOMArrayBufferView> view = DOMUint8Array::deprecatedCreateOrCrash(8); |
| { |
| InSequence s; |
| EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true)); |
| - EXPECT_CALL(channel(), send(Ref(*view->buffer()), 0, 8)); |
| + RefPtr<DOMArrayBuffer> buffer = view->bufferOrNull(); |
| + RELEASE_ASSERT(buffer); // Out of momry? |
|
haraken
2015/10/29 18:58:37
memory
|
| + EXPECT_CALL(channel(), send(Ref(*buffer), 0, 8)); |
| } |
| m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState); |
| EXPECT_FALSE(m_exceptionState.hadException()); |
| m_websocket->didConnect("", ""); |
| - m_websocket->send(view->buffer().get(), m_exceptionState); |
| + RefPtr<DOMArrayBuffer> buffer = view->bufferOrNull(); |
| + RELEASE_ASSERT(buffer); // Out of momry? |
|
haraken
2015/10/29 18:58:37
memory
|
| + m_websocket->send(buffer.get(), m_exceptionState); |
| EXPECT_FALSE(m_exceptionState.hadException()); |
| EXPECT_EQ(DOMWebSocket::OPEN, m_websocket->readyState()); |