Implement WebSocketHandshakeStreamCreateHelper

WebSocketHandshakeStreamCreateHelper is an internal class that stores the data that is needed to create a WebSocketBasicHandshakeStream.

This CL also adds a real implementation of WebSocketStream::CreateAndConnectStream().

This CL depends on https://codereview.chromium.org/23500007/ to compile.

The tests for this CL are in https://codereview.chromium.org/64133006/

BUG=265329
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=237865

[Adam Rice, 2013-11-25 02:24:47]

+yhirano We won't be able to land this CL until after WebSocketBasicStream has
landed, but I would appreciate it if you would take an early look at it for any
problems I have missed.

[yhirano, 2013-11-25 08:43:07]

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
File net/websockets/websocket_handshake_stream_create_helper.h (right):

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:11: #include
"net/websockets/websocket_handshake_stream_base.h"
+ net_export.h

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:21: class
NET_EXPORT_PRIVATE WebSocketHandshakeStreamCreateHelper
If this class cannot create multiple streams (I think so because of its internal
states), let's write so in websocket_handshake_stream_base.h.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:27: virtual
~WebSocketHandshakeStreamCreateHelper() OVERRIDE;
Is OVERRIDE for the destructor needed?

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:33: // of
|connection|.
The latter sentence is no longer necessary.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:49: // This is owned
by the caller of CreateBaseStream() or CreateSpdyStream()
...and this object can outlive the stream.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
File net/websockets/websocket_stream.cc (right):

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_stream.cc:73: // This object owns this. It needs to go
before url_request_ so that it gets
This object refers |this|, you mean?

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
File net/websockets/websocket_stream_for_testing.h (right):

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_stream_for_testing.h:25: extern
scoped_ptr<WebSocketStreamRequest> CreateAndConnectStreamForTesting(
You can declare this function in websocket_test_util.h .

[Adam Rice, 2013-11-25 10:06:20]

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
File net/websockets/websocket_handshake_stream_create_helper.h (right):

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:11: #include
"net/websockets/websocket_handshake_stream_base.h"
On 2013/11/25 08:43:07, yhirano wrote:
> + net_export.h

Done.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:21: class
NET_EXPORT_PRIVATE WebSocketHandshakeStreamCreateHelper
On 2013/11/25 08:43:07, yhirano wrote:
> If this class cannot create multiple streams (I think so because of its
internal
> states), let's write so in websocket_handshake_stream_base.h.

Done.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:27: virtual
~WebSocketHandshakeStreamCreateHelper() OVERRIDE;
On 2013/11/25 08:43:07, yhirano wrote:
> Is OVERRIDE for the destructor needed?

No. It seems to be a strange habit of mine. I removed it.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:33: // of
|connection|.
On 2013/11/25 08:43:07, yhirano wrote:
> The latter sentence is no longer necessary.

Removed.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:49: // This is owned
by the caller of CreateBaseStream() or CreateSpdyStream()
On 2013/11/25 08:43:07, yhirano wrote:
> ...and this object can outlive the stream.

They are both destroyed when the URLRequest object is destroyed when the
handshake ends (or is cancelled). I added a comment to clarify that.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
File net/websockets/websocket_stream.cc (right):

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_stream.cc:73: // This object owns this. It needs to go
before url_request_ so that it gets
On 2013/11/25 08:43:07, yhirano wrote:
> This object refers |this|, you mean?

Sorry, I was just trying to say that the |delegate_| object is owned by the
StreamRequestImpl object. This comment was redundant, so I have removed it.

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
File net/websockets/websocket_stream_for_testing.h (right):

https://codereview.chromium.org/21011003/diff/538001/net/websockets/websocket...
net/websockets/websocket_stream_for_testing.h:25: extern
scoped_ptr<WebSocketStreamRequest> CreateAndConnectStreamForTesting(
On 2013/11/25 08:43:07, yhirano wrote:
> You can declare this function in websocket_test_util.h .

Done.

[yhirano, 2013-11-25 11:29:15]

https://codereview.chromium.org/21011003/diff/618001/net/websockets/websocket...
File net/websockets/websocket_stream.cc (right):

https://codereview.chromium.org/21011003/diff/618001/net/websockets/websocket...
net/websockets/websocket_stream.cc:154:
WebSocketStreamRequest::~WebSocketStreamRequest() {}
I think this class and the derived class don't do what the class comment says
WebSocketStreamRequest does.
Is it just not-yet-implemented?

[Adam Rice, 2013-11-26 06:49:05]

https://codereview.chromium.org/21011003/diff/618001/net/websockets/websocket...
File net/websockets/websocket_stream.cc (right):

https://codereview.chromium.org/21011003/diff/618001/net/websockets/websocket...
net/websockets/websocket_stream.cc:154:
WebSocketStreamRequest::~WebSocketStreamRequest() {}
On 2013/11/25 11:29:15, yhirano wrote:
> I think this class and the derived class don't do what the class comment says
> WebSocketStreamRequest does.
> Is it just not-yet-implemented?

I added an explicit destructor for StreamRequestImpl and a comment on line 62
that I hope makes it clear how the cancellation of the handshake works.

There are tests that cancellation works in various scenarious in
https://codereview.chromium.org/64133006/diff/290001/net/websockets/websocket...

[yhirano, 2013-11-26 07:08:38]

lgtm

https://codereview.chromium.org/21011003/diff/618001/net/websockets/websocket...
File net/websockets/websocket_stream.cc (right):

https://codereview.chromium.org/21011003/diff/618001/net/websockets/websocket...
net/websockets/websocket_stream.cc:154:
WebSocketStreamRequest::~WebSocketStreamRequest() {}
On 2013/11/26 06:49:05, Adam Rice wrote:
> On 2013/11/25 11:29:15, yhirano wrote:
> > I think this class and the derived class don't do what the class comment
says
> > WebSocketStreamRequest does.
> > Is it just not-yet-implemented?
> 
> I added an explicit destructor for StreamRequestImpl and a comment on line 62
> that I hope makes it clear how the cancellation of the handshake works.
> 
> There are tests that cancellation works in various scenarious in
>
https://codereview.chromium.org/64133006/diff/290001/net/websockets/websocket...

I'm sorry, you are right.

[Adam Rice, 2013-11-26 07:14:17]

+tyoshino for net/websockets/ OWNERS.

[tyoshino (SeeGerritForStatus), 2013-11-27 05:29:40]

lgtm

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
File net/websockets/websocket_handshake_stream_create_helper.cc (right):

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.cc:34: // Create a
WebSocketSpdyStream.
WebSocketSpdyHandshakeStream ?

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
File net/websockets/websocket_handshake_stream_create_helper.h (right):

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:37: // Create a
WebSocketSpdyStream.
WebSocketSpdyHandshakeStream ?

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
File net/websockets/websocket_stream.cc (right):

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
net/websockets/websocket_stream.cc:56:
scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate)
use the same order as the members for these two arguments?

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
File net/websockets/websocket_test_util.h (right):

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
net/websockets/websocket_test_util.h:18: class URLRequestContext;
dup

[Adam Rice, 2013-11-27 06:39:32]

+szym for net/ OWNERS.

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
File net/websockets/websocket_handshake_stream_create_helper.cc (right):

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.cc:34: // Create a
WebSocketSpdyStream.
On 2013/11/27 05:29:41, tyoshino wrote:
> WebSocketSpdyHandshakeStream ?

I made it a TODO.

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
File net/websockets/websocket_handshake_stream_create_helper.h (right):

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.h:37: // Create a
WebSocketSpdyStream.
On 2013/11/27 05:29:41, tyoshino wrote:
> WebSocketSpdyHandshakeStream ?

I changed it to just say unimplemented.

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
File net/websockets/websocket_stream.cc (right):

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
net/websockets/websocket_stream.cc:56:
scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate)
On 2013/11/27 05:29:41, tyoshino wrote:
> use the same order as the members for these two arguments?

Done.

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
File net/websockets/websocket_test_util.h (right):

https://codereview.chromium.org/21011003/diff/768001/net/websockets/websocket...
net/websockets/websocket_test_util.h:18: class URLRequestContext;
On 2013/11/27 05:29:41, tyoshino wrote:
> dup

Done.

[szym, 2013-11-27 07:49:07]

lgtm

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
File net/websockets/websocket_handshake_stream_create_helper.cc (right):

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.cc:28: new
WebSocketBasicHandshakeStream(connection.Pass(),
nit: indent of 4 spaces would be enough.

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.cc:34: // TODO(ricea):
Create a WebSocketSpdyHandshakeStream.
Add crbug.com

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
File net/websockets/websocket_test_util.h (right):

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
net/websockets/websocket_test_util.h:31: // |requested_subprotocols|.
Add comment that implementation is in websocket_stream.cc

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
net/websockets/websocket_test_util.h:39: NET_EXPORT_PRIVATE;
For consistency, NET_EXPORT_PRIVATE should go first in the function prototype.

[Adam Rice, 2013-11-27 11:27:59]

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
File net/websockets/websocket_handshake_stream_create_helper.cc (right):

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.cc:28: new
WebSocketBasicHandshakeStream(connection.Pass(),
On 2013/11/27 07:49:08, szym wrote:
> nit: indent of 4 spaces would be enough.

Done.

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
net/websockets/websocket_handshake_stream_create_helper.cc:34: // TODO(ricea):
Create a WebSocketSpdyHandshakeStream.
On 2013/11/27 07:49:08, szym wrote:
> Add http://crbug.com

Done.

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
File net/websockets/websocket_test_util.h (right):

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
net/websockets/websocket_test_util.h:31: // |requested_subprotocols|.
On 2013/11/27 07:49:08, szym wrote:
> Add comment that implementation is in websocket_stream.cc

Done.

https://codereview.chromium.org/21011003/diff/788001/net/websockets/websocket...
net/websockets/websocket_test_util.h:39: NET_EXPORT_PRIVATE;
On 2013/11/27 07:49:08, szym wrote:
> For consistency, NET_EXPORT_PRIVATE should go first in the function prototype.

Done.

[commit-bot: I haz the power, 2013-11-28 09:45:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/21011003/828001

[commit-bot: I haz the power, 2013-11-28 10:48:02]

Retried try job too often on win for step(s) compile
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win&number...

[commit-bot: I haz the power, 2013-11-29 00:47:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/21011003/858001

[commit-bot: I haz the power, 2013-11-29 02:55:07]

Change committed as 237865