[WebSocket] Make subprotocol and extensions live in WebSocket

Source/web/WebSocketImpl.h

 /*
  * Copyright (C) 2011, 2012 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebSocketImpl_h
 #define WebSocketImpl_h
 
 #include "modules/websockets/WebSocketChannelClient.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebCommon.h"
+#include "public/platform/WebString.h"
 #include "public/web/WebSocket.h"
 #include "public/web/WebSocketClient.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore { class WebSocketChannel; }
 
 namespace blink {
 
 class WebDocument;
-class WebString;
 class WebURL;
 
 class WebSocketImpl FINAL : public WebSocket, public WebCore::WebSocketChannelClient {
 public:
     WebSocketImpl(const WebDocument&, WebSocketClient*);
     virtual ~WebSocketImpl();
 
     bool isNull() const { return !m_private; }
 
     virtual BinaryType binaryType() const OVERRIDE;
     virtual bool setBinaryType(BinaryType) OVERRIDE;
     virtual void connect(const WebURL&, const WebString& protocol) OVERRIDE;
     virtual WebString subprotocol() OVERRIDE;
     virtual WebString extensions() OVERRIDE;
     virtual bool sendText(const WebString&) OVERRIDE;
     virtual bool sendArrayBuffer(const WebArrayBuffer&) OVERRIDE;
     virtual unsigned long bufferedAmount() const OVERRIDE;
     virtual void close(int code, const WebString& reason) OVERRIDE;
     virtual void fail(const WebString& reason) OVERRIDE;
     virtual void disconnect() OVERRIDE;
 
     // WebSocketChannelClient
-    virtual void didConnect() OVERRIDE;
+    virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;
     virtual void didReceiveMessage(const String& message) OVERRIDE;
     virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData) OVERRIDE;
     virtual void didReceiveMessageError() OVERRIDE;
     virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) OVERRIDE;
     virtual void didStartClosingHandshake() OVERRIDE;
     virtual void didClose(unsigned long bufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
 
 private:
     RefPtrWillBePersistent<WebCore::WebSocketChannel> m_private;
     WebSocketClient* m_client;
     BinaryType m_binaryType;
+    WebString m_subprotocol;
+    WebString m_extensions;
 };
 
 } // namespace blink
 
 #endif // WebWebSocketChannelImpl_h