third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp - Issue 2102993002: Fix WebSocket to set first party for cookies

Unified Diff: third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp

Issue 2102993002: Fix WebSocket to set first party for cookies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: a Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/http/tests/security/cookies/websocket/resources/third-party-iframe.html ('K') | « third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp ('k') | third_party/WebKit/public/platform/modules/websockets/WebSocketHandle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 69036091dc8f859d487578fef01f86e10b7e7ef3..8011053cd01f708839f6ecf55972f13020a92436 100644

--- a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp

+++ b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp

@@ -81,7 +81,7 @@ public:

~MockWebSocketHandle() override { }

- MOCK_METHOD4(connect, void(const WebURL&, const WebVector<WebString>&, const WebSecurityOrigin&, WebSocketHandleClient*));

+ MOCK_METHOD5(connect, void(const WebURL&, const WebVector<WebString>&, const WebSecurityOrigin&, const WebURL&, WebSocketHandleClient*));

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&));

@@ -133,7 +133,7 @@ public:

{

InSequence s;

- EXPECT_CALL(*handle(), connect(WebURL(KURL(KURL(), "ws://localhost/")), _, _, handleClient()));

+ EXPECT_CALL(*handle(), connect(WebURL(KURL(KURL(), "ws://localhost/")), _, _, _, handleClient()));

EXPECT_CALL(*handle(), flowControl(65536));

EXPECT_CALL(*channelClient(), didConnect(String("a"), String("b")));

}

@@ -164,7 +164,7 @@ TEST_F(DocumentWebSocketChannelTest, connectSuccess)

Checkpoint checkpoint;

{

InSequence s;

- EXPECT_CALL(*handle(), connect(WebURL(KURL(KURL(), "ws://localhost/")), _, _, handleClient()));

+ EXPECT_CALL(*handle(), connect(WebURL(KURL(KURL(), "ws://localhost/")), _, _, _, handleClient()));

Mike West 2016/06/28 11:25:37 Nit: Why not check the values passed into `connect

tyoshino (SeeGerritForStatus) 2016/07/04 08:13:42 Done.

EXPECT_CALL(*handle(), flowControl(65536));

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*channelClient(), didConnect(String("a"), String("b")));