SPDY - default to SPDY/2.1 protocol in unittests

net/spdy/spdy_session.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/spdy/spdy_session.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/message_loop.h"
@@ skipping 209 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(NetLogSpdyGoAwayParameter);
 };
 
 }  // namespace
 
 // static
 bool SpdySession::use_ssl_ = true;
 
 // static
-bool SpdySession::use_flow_control_ = false;
+SpdySession::FlowControl SpdySession::use_flow_control_ =
+    SpdySession::kFlowControlBasedOnNPN;
 
 // static
 size_t SpdySession::init_max_concurrent_streams_ = 10;
 
 // static
 size_t SpdySession::max_concurrent_stream_limit_ = 256;
 
 // static
 bool SpdySession::enable_ping_based_connection_checking_ = true;
 
@@ skipping 34 matching lines @@
       bytes_received_(0),
       sent_settings_(false),
       received_settings_(false),
       stalled_streams_(0),
       pings_in_flight_(0),
       next_ping_id_(1),
       received_data_time_(base::TimeTicks::Now()),
       trailing_ping_pending_(false),
       check_ping_status_pending_(false),
       need_to_send_ping_(false),
-      flow_control_(use_flow_control_),
+      flow_control_(false),
       initial_send_window_size_(spdy::kSpdyStreamInitialWindowSize),
       initial_recv_window_size_(spdy::kSpdyStreamInitialWindowSize),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SPDY_SESSION)),
       verify_domain_authentication_(verify_domain_authentication) {
   DCHECK(HttpStreamFactory::spdy_enabled());
   net_log_.BeginEvent(
       NetLog::TYPE_SPDY_SESSION,
       make_scoped_refptr(
           new NetLogSpdySessionParameter(host_port_proxy_pair_)));
 
+  // In unittests, check if use_flow_control_ is enabled or disabled.

[wtc, 2012/01/26 00:13:26]

Nit: change all occurrences of "unittests" to "unit tests"

The code here means flow_control_ is false for
SpdySession::kFlowControlBasedOnNPN.  Is that intended?

[ramant (doing other things), 2012/01/26 18:58:48]

Done.

Until the server is ready to support flow control, we will initialize to false
(afterwards we will initialize to true). We determine the flow_control based on
the protocol version that is negotiated.

+  if (use_flow_control_ == SpdySession::kEnableFlowControl)
+    flow_control_ = true;
+
   // TODO(mbelshe): consider randomization of the stream_hi_water_mark.
 
   buffered_spdy_framer_.set_visitor(this);
 
   SendSettings();
 }
 
 SpdySession::PendingCreateStream::~PendingCreateStream() {}
 
 SpdySession::CallbackResultPair::~CallbackResultPair() {}
@@ skipping 31 matching lines @@
 
   state_ = CONNECTED;
   connection_.reset(connection);
   is_secure_ = is_secure;
   certificate_error_code_ = certificate_error_code;
 
   if (is_secure_) {
     SSLClientSocket* ssl_socket =
         reinterpret_cast<SSLClientSocket*>(connection_->socket());
     DCHECK(ssl_socket);
-    if (ssl_socket->protocol_negotiated() == SSLClientSocket::kProtoSPDY21)
+    if (ssl_socket->protocol_negotiated() == SSLClientSocket::kProtoSPDY21) {
       flow_control_ = true;
+
+      // In unittests, check if use_flow_control_ is enabled or disabled.
+      if (use_flow_control_ == SpdySession::kDisableFlowControl)
+        flow_control_ = false;
+

[wtc, 2012/01/26 00:13:26]

Delete this blank line.

[ramant (doing other things), 2012/01/26 18:58:48]

Done.

+    } else {
+      flow_control_ = false;
+
+      // In unittests, check if use_flow_control_ is enabled or disabled.
+      if (use_flow_control_ == SpdySession::kEnableFlowControl)
+        flow_control_ = true;
+    }

[wtc, 2012/01/26 00:13:26]

This logic is hard to understand.  It would be nice to explain
it.  I think this logic says in SPDY 2.1 flow control is
enabled by default, whereas in SPDY 2 flow control is disabled
by default.  Correct?

To support SPDY 3 in the future, I think the test on
line 352 should be
  ssl_socket->protocol_negotiated() >= SSLClientSocket::kProtoSPDY21

[ramant (doing other things), 2012/01/26 18:58:48]

Done.

   }
 
   // Write out any data that we might have to send, such as the settings frame.
   WriteSocketLater();
   net::Error error = ReadSocket();
   if (error == ERR_IO_PENDING)
     return OK;
   return error;
 }
 
@@ skipping 1392 matching lines @@
   if (it == pending_callback_map_.end())
     return;
 
   CompletionCallback callback = it->second.callback;
   int result = it->second.result;
   pending_callback_map_.erase(it);
   callback.Run(result);
 }
 
 }  // namespace net