Introduce RequestWebSocketStream into HttpStreamFactory

net/socket/socket_test_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/socket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 1267 matching lines @@
     SSLSocketDataProvider* data)
     : MockClientSocket(
          // Have to use the right BoundNetLog for LoadTimingInfo regression
          // tests.
          transport_socket->socket()->NetLog()),
       transport_(transport_socket),
       data_(data),
       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;
 }
 
 MockSSLClientSocket::~MockSSLClientSocket() {
   Disconnect();
 }
 
 int MockSSLClientSocket::Read(IOBuffer* buf, int buf_len,
@@ skipping 44 matching lines @@
 }
 
 bool MockSSLClientSocket::GetSSLInfo(SSLInfo* ssl_info) {
   ssl_info->Reset();
   ssl_info->cert = data_->cert;
   ssl_info->client_cert_sent = data_->client_cert_sent;
   ssl_info->channel_id_sent = data_->channel_id_sent;
   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);
   if (data_->cert_request_info) {
     cert_request_info->host_and_port =
         data_->cert_request_info->host_and_port;
     cert_request_info->client_certs = data_->cert_request_info->client_certs;
   } else {
     cert_request_info->Reset();
   }
@@ skipping 486 matching lines @@
 
 const char kSOCKS5OkRequest[] =
     { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
 
 const char kSOCKS5OkResponse[] =
     { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
 
 }  // namespace net