Revert 176298 "[WebSocket] bufferedAmount should not decrease in..."

trunk/Source/modules/websockets/WebSocketTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "modules/websockets/WebSocket.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/V8Binding.h"
@@ skipping 98 matching lines @@
     virtual ~WebSocketTestBase()
     {
         if (!m_websocket)
             return;
         // These statements are needed to clear WebSocket::m_channel to
         // avoid ASSERTION failure on ~WebSocket.
         ASSERT(m_websocket->channel());
         ::testing::Mock::VerifyAndClear(m_websocket->channel());
         EXPECT_CALL(channel(), disconnect()).Times(AnyNumber());
 
-        m_websocket->didClose(WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
+        m_websocket->didClose(0, WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
         m_websocket.clear();
         Heap::collectAllGarbage();
     }
 
     MockWebSocketChannel& channel() { return *m_websocket->channel(); }
 
     OwnPtr<DummyPageHolder> m_pageHolder;
     RefPtrWillBePersistent<WebSocketWithMockChannel> m_websocket;
     V8TestingScope m_executionScope;
     ExceptionState m_exceptionState;
@@ skipping 157 matching lines @@
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), disconnect());
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(WebSocket::CONNECTING, m_websocket->readyState());
 
-    m_websocket->didClose(WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
+    m_websocket->didClose(0, WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
 
     EXPECT_EQ(WebSocket::CLOSED, m_websocket->readyState());
 }
 
 TEST_F(WebSocketTest, maximumReasonSize)
 {
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), fail(_, _, _, _));
@@ skipping 148 matching lines @@
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(WebSocket::CONNECTING, m_websocket->readyState());
 
     m_websocket->didConnect("", "");
     EXPECT_EQ(WebSocket::OPEN, m_websocket->readyState());
     m_websocket->close(m_exceptionState);
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(WebSocket::CLOSING, m_websocket->readyState());
 
-    m_websocket->didClose(WebSocketChannelClient::ClosingHandshakeComplete, 1000, String());
+    m_websocket->didClose(0, WebSocketChannelClient::ClosingHandshakeComplete, 1000, String());
     EXPECT_EQ(WebSocket::CLOSED, m_websocket->readyState());
     m_websocket->close(m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(WebSocket::CLOSED, m_websocket->readyState());
 }
 
 TEST_F(WebSocketTest, sendStringWhenConnecting)
 {
     {
@@ skipping 39 matching lines @@
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), disconnect());
         EXPECT_CALL(checkpoint, Call(1));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
 
-    m_websocket->didClose(WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
+    m_websocket->didClose(0, WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
     checkpoint.Call(1);
 
     m_websocket->send("hello", m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(WebSocket::CLOSED, m_websocket->readyState());
 }
 
 TEST_F(WebSocketTest, sendStringSuccess)
 {
@@ skipping 98 matching lines @@
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/"), String())).WillOnce(Return(true));
         EXPECT_CALL(channel(), disconnect());
         EXPECT_CALL(checkpoint, Call(1));
     }
     m_websocket->connect("ws://example.com/", Vector<String>(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
 
-    m_websocket->didClose(WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
+    m_websocket->didClose(0, WebSocketChannelClient::ClosingHandshakeIncomplete, 1006, "");
     checkpoint.Call(1);
 
     m_websocket->send(view->buffer().get(), m_exceptionState);
 
     EXPECT_FALSE(m_exceptionState.hadException());
     EXPECT_EQ(WebSocket::CLOSED, m_websocket->readyState());
 }
 
 TEST_F(WebSocketTest, sendArrayBufferSuccess)
 {
@@ skipping 129 matching lines @@
     EXPECT_EQ(InvalidAccessError, m_exceptionState.code());
     EXPECT_EQ(String::format("The code must be either 1000, or between 3000 and 4999. %d is neither.", GetParam()), m_exceptionState.message());
     EXPECT_EQ(WebSocket::CONNECTING, m_websocket->readyState());
 }
 
 INSTANTIATE_TEST_CASE_P(WebSocketInvalidClosingCode, WebSocketInvalidClosingCodeTest, ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535));
 
 } // namespace
 
 } // namespace WebCore