Revert "Move WebSocketHandleImpl into Blink"

third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.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 "modules/websockets/WebSocketChannel.h"
 
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/Document.h"
 #include "core/fileapi/Blob.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/websockets/DocumentWebSocketChannel.h"
 #include "modules/websockets/WebSocketChannelClient.h"
-#include "modules/websockets/WebSocketHandle.h"
-#include "modules/websockets/WebSocketHandleClient.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
+#include "public/platform/WebSecurityOrigin.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
+#include "public/platform/WebVector.h"
+#include "public/platform/modules/websockets/WebSocketHandle.h"
+#include "public/platform/modules/websockets/WebSocketHandleClient.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 #include <memory>
 #include <stdint.h>
 
 using testing::_;
 using testing::InSequence;
@@ skipping 42 matching lines @@
 public:
     static MockWebSocketHandle* create()
     {
         return new testing::StrictMock<MockWebSocketHandle>();
     }
 
     MockWebSocketHandle() { }
 
     ~MockWebSocketHandle() override { }
 
-    MOCK_METHOD6(connect, void(const KURL&, const Vector<String>&, SecurityOrigin*, const KURL&, const String&, WebSocketHandleClient*));
+    MOCK_METHOD6(connect, void(const WebURL&, const WebVector<WebString>&, const WebSecurityOrigin&, const WebURL&, const WebString&, 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 String&));
+    MOCK_METHOD2(close, void(unsigned short, const WebString&));
 };
 
 class DocumentWebSocketChannelTest : public ::testing::Test {
 public:
     DocumentWebSocketChannelTest()
         : m_pageHolder(DummyPageHolder::create())
         , m_channelClient(MockWebSocketChannelClient::create())
         , m_handle(MockWebSocketHandle::create())
         , m_channel(DocumentWebSocketChannel::create(&m_pageHolder->document(), m_channelClient.get(), SourceLocation::capture(), handle()))
         , m_sumOfConsumedBufferedAmount(0)
@@ skipping 28 matching lines @@
 
     void didConsumeBufferedAmount(unsigned long a)
     {
         m_sumOfConsumedBufferedAmount += a;
     }
 
     void connect()
     {
         {
             InSequence s;
-            EXPECT_CALL(*handle(), connect(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")));
         }
         EXPECT_TRUE(channel()->connect(KURL(KURL(), "ws://localhost/"), "x"));
-        handleClient()->didConnect(handle(), String("a"), String("b"));
+        handleClient()->didConnect(handle(), WebString("a"), WebString("b"));
         ::testing::Mock::VerifyAndClearExpectations(this);
     }
 
     std::unique_ptr<DummyPageHolder> m_pageHolder;
     Persistent<MockWebSocketChannelClient> m_channelClient;
     MockWebSocketHandle* m_handle;
     Persistent<DocumentWebSocketChannel> m_channel;
     unsigned long m_sumOfConsumedBufferedAmount;
 };
 
 MATCHER_P2(MemEq, p, len,
     std::string("pointing to memory")
     + (negation ? " not" : "")
     + " equal to \""
     + std::string(p, len) + "\" (length=" + PrintToString(len) + ")"
 )
 {
     return memcmp(arg, p, len) == 0;
 }
 
-MATCHER_P(KURLEq, urlString,
+MATCHER_P(WebURLEq, urlString,
     std::string(negation ? "doesn't equal" : "equals")
     + " to \"" + urlString + "\""
 )
 {
-    KURL url(KURL(), urlString);
-    *result_listener << "where the url is \"" << arg.getString().utf8().data() << "\"";
+    WebURL url(KURL(KURL(), urlString));
+    *result_listener << "where the url is \"" << arg.string().utf8() << "\"";
     return arg == url;
 }
 
 TEST_F(DocumentWebSocketChannelTest, connectSuccess)
 {
-    Vector<String> protocols;
-    RefPtr<SecurityOrigin> origin;
+    WebVector<WebString> protocols;
+    WebSecurityOrigin origin;
 
     Checkpoint checkpoint;
     {
         InSequence s;
-        EXPECT_CALL(*handle(), connect(KURLEq("ws://localhost/"), _, _, KURLEq("http://example.com/"), _, handleClient())).WillOnce(DoAll(
+        EXPECT_CALL(*handle(), connect(WebURLEq("ws://localhost/"), _, _, WebURLEq("http://example.com/"), _, handleClient())).WillOnce(DoAll(
             SaveArg<1>(&protocols),
             SaveArg<2>(&origin)));
         EXPECT_CALL(*handle(), flowControl(65536));
         EXPECT_CALL(checkpoint, Call(1));
         EXPECT_CALL(*channelClient(), didConnect(String("a"), String("b")));
     }
 
     KURL pageUrl(KURL(), "http://example.com/");
     m_pageHolder->frame().securityContext()->setSecurityOrigin(SecurityOrigin::create(pageUrl));
     Document& document = m_pageHolder->document();
     document.setURL(pageUrl);
     // Make sure that firstPartyForCookies() is set to the given value.
     EXPECT_STREQ("http://example.com/", document.firstPartyForCookies().getString().utf8().data());
 
     EXPECT_TRUE(channel()->connect(KURL(KURL(), "ws://localhost/"), "x"));
 
     EXPECT_EQ(1U, protocols.size());
     EXPECT_STREQ("x", protocols[0].utf8().data());
 
-    EXPECT_STREQ("http://example.com", origin->toString().utf8().data());
+    EXPECT_STREQ("http://example.com", origin.toString().utf8().data());
 
     checkpoint.Call(1);
-    handleClient()->didConnect(handle(), String("a"), String("b"));
+    handleClient()->didConnect(handle(), WebString("a"), WebString("b"));
 }
 
 TEST_F(DocumentWebSocketChannelTest, sendText)
 {
     connect();
     {
         InSequence s;
         EXPECT_CALL(*handle(), send(true, WebSocketHandle::MessageTypeText, MemEq("foo", 3), 3));
         EXPECT_CALL(*handle(), send(true, WebSocketHandle::MessageTypeText, MemEq("bar", 3), 3));
         EXPECT_CALL(*handle(), send(true, WebSocketHandle::MessageTypeText, MemEq("baz", 3), 3));
@@ skipping 423 matching lines @@
 TEST_F(DocumentWebSocketChannelTest, closeFromBrowser)
 {
     connect();
     Checkpoint checkpoint;
     {
         InSequence s;
 
         EXPECT_CALL(*channelClient(), didStartClosingHandshake());
         EXPECT_CALL(checkpoint, Call(1));
 
-        EXPECT_CALL(*handle(), close(WebSocketChannel::CloseEventCodeNormalClosure, String("close reason")));
+        EXPECT_CALL(*handle(), close(WebSocketChannel::CloseEventCodeNormalClosure, WebString("close reason")));
         EXPECT_CALL(checkpoint, Call(2));
 
         EXPECT_CALL(*channelClient(), didClose(WebSocketChannelClient::ClosingHandshakeComplete, WebSocketChannel::CloseEventCodeNormalClosure, String("close reason")));
         EXPECT_CALL(checkpoint, Call(3));
     }
 
     handleClient()->didStartClosingHandshake(handle());
     checkpoint.Call(1);
 
     channel()->close(WebSocketChannel::CloseEventCodeNormalClosure, String("close reason"));
     checkpoint.Call(2);
 
     handleClient()->didClose(handle(), true, WebSocketChannel::CloseEventCodeNormalClosure, String("close reason"));
     checkpoint.Call(3);
 
     channel()->disconnect();
 }
 
 TEST_F(DocumentWebSocketChannelTest, closeFromWebSocket)
 {
     connect();
     Checkpoint checkpoint;
     {
         InSequence s;
 
-        EXPECT_CALL(*handle(), close(WebSocketChannel::CloseEventCodeNormalClosure, String("close reason")));
+        EXPECT_CALL(*handle(), close(WebSocketChannel::CloseEventCodeNormalClosure, WebString("close reason")));
         EXPECT_CALL(checkpoint, Call(1));
 
         EXPECT_CALL(*channelClient(), didClose(WebSocketChannelClient::ClosingHandshakeComplete, WebSocketChannel::CloseEventCodeNormalClosure, String("close reason")));
         EXPECT_CALL(checkpoint, Call(2));
     }
 
     channel()->close(WebSocketChannel::CloseEventCodeNormalClosure, String("close reason"));
     checkpoint.Call(1);
 
     handleClient()->didClose(handle(), true, WebSocketChannel::CloseEventCodeNormalClosure, String("close reason"));
@@ skipping 24 matching lines @@
         EXPECT_CALL(*channelClient(), didError());
         EXPECT_CALL(*channelClient(), didClose(WebSocketChannelClient::ClosingHandshakeIncomplete, WebSocketChannel::CloseEventCodeAbnormalClosure, String()));
     }
 
     channel()->fail("fail message from WebSocket", ErrorMessageLevel, SourceLocation::create(String(), 0, 0, nullptr));
 }
 
 } // namespace
 
 } // namespace blink