Introduce RequestWebSocketStream into HttpStreamFactory

net/socket/socket_test_util.cc

Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index a14ab2a5d2cd58f9432faa312bf1e522253d3c05..cf2cfcf6fcc211bffcaa2180847c50e41b801fb4 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -1285,6 +1285,8 @@ MockSSLClientSocket::MockSSLClientSocket(
       is_npn_state_set_(false),
       new_npn_value_(false),
       is_protocol_negotiated_set_(false),
+      was_spdy_negotiated_(false),
+      was_spdy_negotiated_set_(false),
       protocol_negotiated_(kProtoUnknown) {
   DCHECK(data_);
   peer_addr_ = data->connect.peer_addr;
@@ -1349,6 +1351,21 @@ bool MockSSLClientSocket::GetSSLInfo(SSLInfo* ssl_info) {
   return true;
 }
 
+bool MockSSLClientSocket::was_spdy_negotiated() const {

[mmenke, 2013/06/03 21:10:18]

This should be WasSpdyNegotiated, since it's not a simple function, and not
inlined.

[yhirano, 2013/06/04 02:20:13]

Since it is a derived function, I have no choice (unless I change the function
name in the base class and it is beyond this CL).

+  if (was_spdy_negotiated_set_)
+    return was_spdy_negotiated_;
+  return
+      WasNpnNegotiated() &&

[mmenke, 2013/06/03 21:10:18]

nit:  Suggest putting this on the previous line (return just looks weird alone
on a line).

[yhirano, 2013/06/04 02:20:13]

Done.

+      kProtoSPDYMinimumVersion <= GetNegotiatedProtocol() &&
+      GetNegotiatedProtocol() <= kProtoSPDYMaximumVersion;

[mmenke, 2013/06/03 21:10:18]

I find this confusing - since we have set_was_spdy_negotiated, one would assume
this returns the last value it was called with.  Think this is worth a comment.

[yhirano, 2013/06/04 02:20:13]

Done.

+}
+
+bool MockSSLClientSocket::set_was_spdy_negotiated(bool negotiated) {

[mmenke, 2013/06/03 21:10:18]

It's my understanding that, according to the Google style guide, all functions
named this would should be inlined.

[yhirano, 2013/06/04 02:20:13]

Moving the implementation into the header causes a warning:
  warning: [chromium-style] virtual methods with non-empty bodies shouldn't be
declared inline.
Again, I can't rename this function because this is a derived function.

[mmenke, 2013/06/05 00:01:20]

Sorry, didn't notice they were virtual.

I may fix their naming in a future CL, but it's beyond the scope of this one.

+  was_spdy_negotiated_set_ = true;
+  was_spdy_negotiated_ = negotiated;
+  return was_spdy_negotiated_;
+}
+
 void MockSSLClientSocket::GetSSLCertRequestInfo(
     SSLCertRequestInfo* cert_request_info) {
   DCHECK(cert_request_info);