Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / websockets / websocket_handshake_stream_create_helper.cc

diff --git a/src/net/websockets/websocket_handshake_stream_create_helper.cc b/src/net/websockets/websocket_handshake_stream_create_helper.cc
index e68052e..2bd59a1 100644 (file)
--- a/src/net/websockets/websocket_handshake_stream_create_helper.cc
+++ b/src/net/websockets/websocket_handshake_stream_create_helper.cc
@@ -35,12 +35,16 @@ WebSocketHandshakeStreamCreateHelper::CreateBasicStream(
   // method.
   std::vector<std::string> extensions(
       1, "permessage-deflate; client_max_window_bits");
-  return stream_ = new WebSocketBasicHandshakeStream(connection.Pass(),
-                                                     connect_delegate_,
-                                                     using_proxy,
-                                                     requested_subprotocols_,
-                                                     extensions,
-                                                     failure_message_);
+  WebSocketBasicHandshakeStream* stream =
+      new WebSocketBasicHandshakeStream(connection.Pass(),
+                                        connect_delegate_,
+                                        using_proxy,
+                                        requested_subprotocols_,
+                                        extensions,
+                                        failure_message_);
+  OnStreamCreated(stream);
+  stream_ = stream;
+  return stream;
 }
 
 // TODO(ricea): Create a WebSocketSpdyHandshakeStream. crbug.com/323852
@@ -52,4 +56,15 @@ WebSocketHandshakeStreamCreateHelper::CreateSpdyStream(
   return NULL;
 }
 
+scoped_ptr<WebSocketStream> WebSocketHandshakeStreamCreateHelper::Upgrade() {
+  DCHECK(stream_);
+  WebSocketHandshakeStreamBase* stream = stream_;
+  stream_ = NULL;
+  return stream->Upgrade();
+}
+
+void WebSocketHandshakeStreamCreateHelper::OnStreamCreated(
+    WebSocketBasicHandshakeStream* stream) {
+}
+
 }  // namespace net