summaryrefslogtreecommitdiffstats
path: root/net/websockets/websocket_frame_handler_unittest.cc
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 10:22:32 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 10:22:32 +0000
commitd513d6ea5eec4773e299d2bae17e9159cebf0446 (patch)
treee170a5fea6b4b8a37c2037574cd221a925b43e3e /net/websockets/websocket_frame_handler_unittest.cc
parentc4e9890a10fb35a78247be5d204d77f512d7654c (diff)
downloadchromium_src-d513d6ea5eec4773e299d2bae17e9159cebf0446.zip
chromium_src-d513d6ea5eec4773e299d2bae17e9159cebf0446.tar.gz
chromium_src-d513d6ea5eec4773e299d2bae17e9159cebf0446.tar.bz2
Fix regression of websocket/tests/simple-stress.html
Since stress-test.html tries to send 256K message, but we'll set 32K for max_pending_send_allowed in SocketStream. Thus, WebCore::SocketStreamHandle won't send full websocket frame for such large message since WebSocketJob doesn't notify OnSentData at all. Don't parse websocket frame for sending to avoid this issue for now. Also disable buffering and parsing websocket frame for receiving to fix performance regression. BUG=32018 TEST=LayoutTests/websocket/tests/stress-test.html passes Review URL: http://codereview.chromium.org/2453002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets/websocket_frame_handler_unittest.cc')
-rw-r--r--net/websockets/websocket_frame_handler_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/websockets/websocket_frame_handler_unittest.cc b/net/websockets/websocket_frame_handler_unittest.cc
index 80f0e59..52d70de 100644
--- a/net/websockets/websocket_frame_handler_unittest.cc
+++ b/net/websockets/websocket_frame_handler_unittest.cc
@@ -19,7 +19,7 @@ TEST(WebSocketFrameHandlerTest, Basic) {
scoped_ptr<WebSocketFrameHandler> handler(new WebSocketFrameHandler);
// No data.
- EXPECT_EQ(0, handler->UpdateCurrentBuffer());
+ EXPECT_EQ(0, handler->UpdateCurrentBuffer(true));
EXPECT_TRUE(handler->GetCurrentBuffer() == NULL);
EXPECT_EQ(0, handler->GetCurrentBufferSize());
@@ -27,7 +27,7 @@ TEST(WebSocketFrameHandlerTest, Basic) {
// or data is received from network (WebSocketJob::OnReceivedData)
handler->AppendData(kInputData, kInputDataLen);
EXPECT_TRUE(handler->GetCurrentBuffer() == NULL);
- EXPECT_GT(handler->UpdateCurrentBuffer(), 0);
+ EXPECT_GT(handler->UpdateCurrentBuffer(true), 0);
// Get data to send to the socket (send),
// or to send to WebKit (receive).
IOBuffer* buf = handler->GetCurrentBuffer();
@@ -40,7 +40,7 @@ TEST(WebSocketFrameHandlerTest, Basic) {
handler->ReleaseCurrentBuffer();
EXPECT_TRUE(handler->GetCurrentBuffer() == NULL);
EXPECT_EQ(0, handler->GetCurrentBufferSize());
- EXPECT_EQ(0, handler->UpdateCurrentBuffer());
+ EXPECT_EQ(0, handler->UpdateCurrentBuffer(true));
}
TEST(WebSocketFrameHandlerTest, ParseFrame) {