| Index: third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp
|
| index f94491934e013e1218731b6381a380f1f652722f..b9c8a111a4838bc9d3f29fead69b9dac03244473 100644
|
| --- a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp
|
| @@ -52,11 +52,16 @@ public:
|
|
|
| MOCK_METHOD2(didConnect, void(const String&, const String&));
|
| MOCK_METHOD1(didReceiveTextMessage, void(const String&));
|
| - void didReceiveBinaryMessage(PassOwnPtr<Vector<char>> payload) override
|
| + void didReceiveArrayBuffer(PassOwnPtr<Vector<char>> payload) override
|
| {
|
| - didReceiveBinaryMessageMock(*payload);
|
| + didReceiveArrayBufferMock(*payload);
|
| }
|
| - MOCK_METHOD1(didReceiveBinaryMessageMock, void(const Vector<char>&));
|
| + MOCK_METHOD1(didReceiveArrayBufferMock, void(const Vector<char>&));
|
| + void didReceiveBlob(PassRefPtr<BlobDataHandle> blobDataHandle) override
|
| + {
|
| + didReceiveBlobMock(*blobDataHandle);
|
| + }
|
| + MOCK_METHOD1(didReceiveBlobMock, void(const BlobDataHandle&));
|
| MOCK_METHOD0(didError, void());
|
| MOCK_METHOD1(didConsumeBufferedAmount, void(uint64_t));
|
| MOCK_METHOD0(didStartClosingHandshake, void());
|
| @@ -84,6 +89,8 @@ public:
|
| MOCK_METHOD4(send, void(bool, WebSocketHandle::MessageType, const char*, size_t));
|
| MOCK_METHOD1(flowControl, void(int64_t));
|
| MOCK_METHOD2(close, void(unsigned short, const WebString&));
|
| + MOCK_METHOD1(changeBinaryType, void(BinaryType));
|
| + MOCK_METHOD0(confirmBlob, void());
|
| };
|
|
|
| class DocumentWebSocketChannelTest : public ::testing::Test {
|
| @@ -522,7 +529,7 @@ TEST_F(DocumentWebSocketChannelTest, receiveBinary)
|
| connect();
|
| Vector<char> fooVector;
|
| fooVector.append("FOO", 3);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(fooVector));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(fooVector));
|
|
|
| handleClient()->didReceiveData(handle(), true, WebSocketHandle::MessageTypeBinary, "FOOx", 3);
|
| }
|
| @@ -532,7 +539,7 @@ TEST_F(DocumentWebSocketChannelTest, receiveBinaryContinuation)
|
| connect();
|
| Vector<char> bazVector;
|
| bazVector.append("BAZ", 3);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(bazVector));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(bazVector));
|
|
|
| handleClient()->didReceiveData(handle(), false, WebSocketHandle::MessageTypeBinary, "Bx", 1);
|
| handleClient()->didReceiveData(handle(), false, WebSocketHandle::MessageTypeContinuation, "Ax", 1);
|
| @@ -547,22 +554,22 @@ TEST_F(DocumentWebSocketChannelTest, receiveBinaryWithNullBytes)
|
| {
|
| Vector<char> v;
|
| v.append("\0AR", 3);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(v));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(v));
|
| }
|
| {
|
| Vector<char> v;
|
| v.append("B\0Z", 3);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(v));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(v));
|
| }
|
| {
|
| Vector<char> v;
|
| v.append("QU\0", 3);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(v));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(v));
|
| }
|
| {
|
| Vector<char> v;
|
| v.append("\0\0\0", 3);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(v));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(v));
|
| }
|
| }
|
|
|
| @@ -577,7 +584,7 @@ TEST_F(DocumentWebSocketChannelTest, receiveBinaryNonLatin1UTF8)
|
| connect();
|
| Vector<char> v;
|
| v.append("\xe7\x8b\x90\xe0\xa4\x94", 6);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(v));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(v));
|
|
|
| handleClient()->didReceiveData(handle(), true, WebSocketHandle::MessageTypeBinary, "\xe7\x8b\x90\xe0\xa4\x94", 6);
|
| }
|
| @@ -587,7 +594,7 @@ TEST_F(DocumentWebSocketChannelTest, receiveBinaryNonLatin1UTF8Continuation)
|
| connect();
|
| Vector<char> v;
|
| v.append("\xe7\x8b\x90\xe0\xa4\x94", 6);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(v));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(v));
|
|
|
| handleClient()->didReceiveData(handle(), false, WebSocketHandle::MessageTypeBinary, "\xe7\x8b", 2);
|
| handleClient()->didReceiveData(handle(), false, WebSocketHandle::MessageTypeContinuation, "\x90\xe0", 2);
|
| @@ -600,7 +607,7 @@ TEST_F(DocumentWebSocketChannelTest, receiveBinaryNonUTF8)
|
| connect();
|
| Vector<char> v;
|
| v.append("\x80\xff", 2);
|
| - EXPECT_CALL(*channelClient(), didReceiveBinaryMessageMock(v));
|
| + EXPECT_CALL(*channelClient(), didReceiveArrayBufferMock(v));
|
|
|
| handleClient()->didReceiveData(handle(), true, WebSocketHandle::MessageTypeBinary, "\x80\xff", 2);
|
| }
|
|
|