SPDY - default to SPDY/2.1 protocol in unittests

net/spdy/spdy_session.h

 // 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.
 
 #ifndef NET_SPDY_SPDY_SESSION_H_
 #define NET_SPDY_SPDY_SESSION_H_
 #pragma once
 
 #include <deque>
 #include <list>
@@ skipping 30 matching lines @@
 const int kMaxSpdyFrameChunkSize = (2 * kMss) - spdy::SpdyFrame::kHeaderSize;
 
 class BoundNetLog;
 class SpdySettingsStorage;
 class SpdyStream;
 class SSLInfo;
 
 class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
                                public spdy::BufferedSpdyFramerVisitorInterface {
  public:
+  // FlowControl provides the ability for unit tests to either enable or disable
+  // flow control (independent of NPN protocol negotiated). If
+  // |use_flow_control_| is set to kUninitialized then flow control is
+  // determined by the NPN protocol negotiated with the server.
+  enum FlowControl {
+    kUninitialized = 0,

[wtc, 2012/01/26 22:03:25]

IMPORTANT: kUninitialized => kFlowControlUninitialized

otherwise it is not clear what is uninitialized when you
see the SpdySession::kUninitialized enum constant.

I think the original name kFlowControlBasedOnNPN is better.
It just needs to be documented.

[ramant (doing other things), 2012/01/26 22:39:21]

Reverted to kFlowControlBasedOnNPN. Thanks wtc.
Done.

+    kDisableFlowControl = 1,
+    kEnableFlowControl = 2,
+  };
+
   // Create a new SpdySession.
   // |host_port_proxy_pair| is the host/port that this session connects to, and
   // the proxy configuration settings that it's using.
   // |spdy_session_pool| is the SpdySessionPool that owns us.  Its lifetime must
   // strictly be greater than |this|.
   // |session| is the HttpNetworkSession.  |net_log| is the NetLog that we log
   // network events to.
   SpdySession(const HostPortProxyPair& host_port_proxy_pair,
               SpdySessionPool* spdy_session_pool,
               HttpServerProperties* http_server_properties,
@@ skipping 85 matching lines @@
   // Fills SSL Certificate Request info |cert_request_info| and returns
   // true when SSL is in use.
   bool GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
 
   // Enable or disable SSL.
   static void SetSSLMode(bool enable) { use_ssl_ = enable; }
   static bool SSLMode() { return use_ssl_; }
 
   // Enable or disable flow control used by unit tests. This only applies for
   // new SpdySessions.
-  static void set_use_flow_control(bool enable) { use_flow_control_ = enable; }
+  static void set_use_flow_control(FlowControl flow_control) {
+    use_flow_control_ = flow_control;
+  }
 
   // Sets the max concurrent streams per session, as a ceiling on any server
   // specific SETTINGS value.
   static void set_max_concurrent_streams(size_t value) {
     max_concurrent_stream_limit_ = value;
   }
   static size_t max_concurrent_streams() {
     return max_concurrent_stream_limit_;
   }
 
@@ skipping 405 matching lines @@
   // announcement to be sent on startup; newly created streams will use
   // this value for the initial receive window size.
   int initial_recv_window_size_;
 
   BoundNetLog net_log_;
 
   // Outside of tests, this should always be true.
   bool verify_domain_authentication_;
 
   static bool use_ssl_;
-  static bool use_flow_control_;
+  static FlowControl use_flow_control_;
   static size_t init_max_concurrent_streams_;
   static size_t max_concurrent_stream_limit_;
 
   // This enables or disables connection health checking system.
   static bool enable_ping_based_connection_checking_;
 
   // |connection_at_risk_of_loss_seconds_| is an optimization to avoid sending
   // wasteful preface pings (when we just got some data).
   //
   // If it is zero (the most conservative figure), then we always send the
@@ skipping 41 matching lines @@
   const spdy::SpdyControlFlags flags_;
   const spdy::SpdyStreamId id_;
   const spdy::SpdyStreamId associated_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLogSpdySynParameter);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_H_