SPDY - disable spdy/2.1 (flow control) by default

net/http/http_stream_factory.cc

Index: net/http/http_stream_factory.cc
===================================================================
--- net/http/http_stream_factory.cc	(revision 124201)
+++ net/http/http_stream_factory.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/host_port_pair.h"
-#include "net/http/http_server_properties.h"
 
 namespace net {
 
@@ -39,6 +38,9 @@
 uint16 HttpStreamFactory::testing_fixed_http_port_ = 0;
 // static
 uint16 HttpStreamFactory::testing_fixed_https_port_ = 0;
+// static
+AlternateProtocol HttpStreamFactory::highest_supported_alternate_protocol_ =
+    NPN_SPDY_2;
 
 HttpStreamFactory::~HttpStreamFactory() {}
 
@@ -82,7 +84,7 @@
 
   AlternateProtocol protocol = ALTERNATE_PROTOCOL_BROKEN;
   // We skip NPN_SPDY_1 here, because we've rolled the protocol version to 2.
-  for (int i = NPN_SPDY_2; i < NUM_ALTERNATE_PROTOCOLS; ++i) {
+  for (int i = NPN_SPDY_2; i <= highest_supported_alternate_protocol_; ++i) {
     if (port_protocol_vector[1] == kAlternateProtocolStrings[i])
       protocol = static_cast<AlternateProtocol>(i);
   }