SPDY - Added enabling of SPDY/3 to about:flags.

net/http/http_network_layer.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/http/http_network_layer.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 28 matching lines @@
 
 // static
 void HttpNetworkLayer::EnableSpdy(const std::string& mode) {
   static const char kOff[] = "off";
   static const char kSSL[] = "ssl";
   static const char kDisableSSL[] = "no-ssl";
   static const char kDisablePing[] = "no-ping";
   static const char kExclude[] = "exclude";  // Hosts to exclude
   static const char kDisableCompression[] = "no-compress";
   static const char kDisableAltProtocols[] = "no-alt-protocols";
-  static const char kEnableVersionThree[] = "v3";
   static const char kForceAltProtocols[] = "force-alt-protocols";
   static const char kSingleDomain[] = "single-domain";
 
-  // If flow-control is enabled, received WINDOW_UPDATE and SETTINGS
-  // messages are processed and outstanding window size is actually obeyed
-  // when sending data frames, and WINDOW_UPDATE messages are generated
-  // when data is consumed.
-  static const char kEnableFlowControl[] = "flow-control";
-
   // We want an A/B experiment between SPDY enabled and SPDY disabled,
   // but only for pages where SPDY *could have been* negotiated.  To do
   // this, we use NPN, but prevent it from negotiating SPDY.  If the
   // server negotiates HTTP, rather than SPDY, today that will only happen
   // on servers that installed NPN (and could have done SPDY).  But this is
   // a bit of a hack, as this correlation between NPN and SPDY is not
   // really guaranteed.
   static const char kEnableNPN[] = "npn";
   static const char kEnableNpnHttpOnly[] = "npn-http";
 
@@ skipping 27 matching lines @@
     } else if (option == kExclude) {
       HttpStreamFactory::add_forced_spdy_exclusion(value);
     } else if (option == kDisableCompression) {
       SpdyFramer::set_enable_compression_default(false);
     } else if (option == kEnableNPN) {
       HttpStreamFactory::set_use_alternate_protocols(use_alt_protocols);
       std::vector<std::string> next_protos;
       next_protos.push_back("http/1.1");
       next_protos.push_back("spdy/2");
       HttpStreamFactory::SetNextProtos(next_protos);
-    } else if (option == kEnableVersionThree) {
-      std::vector<std::string> next_protos;
-      next_protos.push_back("http/1.1");
-      next_protos.push_back("spdy/2");
-      next_protos.push_back("spdy/2.1");
-      next_protos.push_back("spdy/3");
-      HttpStreamFactory::SetNextProtos(next_protos);
     } else if (option == kEnableNpnHttpOnly) {
       // Avoid alternate protocol in this case. Otherwise, browser will try SSL
       // and then fallback to http. This introduces extra load.
       HttpStreamFactory::set_use_alternate_protocols(false);
       std::vector<std::string> next_protos;
       next_protos.push_back("http/1.1");
       next_protos.push_back("http1.1");
       HttpStreamFactory::SetNextProtos(next_protos);
     } else if (option == kDisableAltProtocols) {
       use_alt_protocols = false;
       HttpStreamFactory::set_use_alternate_protocols(false);
-    } else if (option == kEnableFlowControl) {
-      std::vector<std::string> next_protos;
-      next_protos.push_back("http/1.1");
-      next_protos.push_back("spdy/2");
-      next_protos.push_back("spdy/2.1");
-      HttpStreamFactory::SetNextProtos(next_protos);
     } else if (option == kForceAltProtocols) {
       PortAlternateProtocolPair pair;
       pair.port = 443;
       pair.protocol = NPN_SPDY_2;
       HttpServerPropertiesImpl::ForceAlternateProtocol(pair);
     } else if (option == kSingleDomain) {
       SpdySessionPool::ForceSingleDomain();
       LOG(ERROR) << "FORCING SINGLE DOMAIN";
     } else if (option == kInitialMaxConcurrentStreams) {
       int streams;
@@ skipping 30 matching lines @@
 
   if (session_)
     session_->CloseIdleConnections();
 }
 
 void HttpNetworkLayer::OnResume() {
   suspended_ = false;
 }
 
 }  // namespace net