[WebSocket] Make subprotocol and extensions live in WebSocket

Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp

Index: Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
diff --git a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
index eb36a09cc1dcfebeff9a9e971b1d1f17b1bb4f95..9d8b0828f1f7b06485325e38d5fcf5863016b748 100644
--- a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
+++ b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
@@ -54,40 +54,14 @@ PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> ThreadableWebSoc
     return adoptRefWillBeNoop(new ThreadableWebSocketChannelClientWrapper(client));
 }
 
-String ThreadableWebSocketChannelClientWrapper::subprotocol() const
-{
-    if (m_subprotocol.isEmpty())
-        return emptyString();
-    return String(m_subprotocol);
-}
-
-void ThreadableWebSocketChannelClientWrapper::setSubprotocol(const String& subprotocol)
-{
-    m_subprotocol.clear();
-    append(m_subprotocol, subprotocol);
-}
-
-String ThreadableWebSocketChannelClientWrapper::extensions() const
-{
-    if (m_extensions.isEmpty())
-        return emptyString();
-    return String(m_extensions);
-}
-
-void ThreadableWebSocketChannelClientWrapper::setExtensions(const String& extensions)
-{
-    m_extensions.clear();
-    append(m_extensions, extensions);
-}
-
 void ThreadableWebSocketChannelClientWrapper::clearClient()
 {
     m_client = 0;
 }
 
-void ThreadableWebSocketChannelClientWrapper::didConnect()
+void ThreadableWebSocketChannelClientWrapper::didConnect(const String& subprotocol, const String& extensions)
 {
-    m_pendingTasks.append(createCallbackTask(&didConnectCallback, this));
+    m_pendingTasks.append(createCallbackTask(&didConnectCallback, this, subprotocol, extensions));
     if (!m_suspended)
         processPendingTasks();
 }
@@ -155,11 +129,11 @@ void ThreadableWebSocketChannelClientWrapper::processPendingTasks()
         (*iter)->performTask(0);
 }
 
-void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ExecutionContext* context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
+void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ExecutionContext* context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> wrapper, const String& subprotocol, const String& extensions)
 {
     ASSERT_UNUSED(context, !context);
     if (wrapper->m_client)
-        wrapper->m_client->didConnect();
+        wrapper->m_client->didConnect(subprotocol, extensions);
 }
 
 void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ExecutionContext* context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> wrapper, const String& message)