[SPDY] Do not advertise SPDY/2 by default

net/http/http_stream_factory.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_stream_factory.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "net/base/host_mapping_rules.h"
@@ skipping 139 matching lines @@
     return false;
 
   std::list<HostPortPair>::const_iterator it;
   for (it = exclusions->begin(); it != exclusions->end(); ++it)
     if (it->Equals(endpoint))
       return true;
   return false;
 }
 
 // static
-void HttpStreamFactory::EnableNpnSpdy() {
-  set_use_alternate_protocols(true);
-  std::vector<NextProto> next_protos;
-  next_protos.push_back(kProtoHTTP11);
-  next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoSPDY2);
-  SetNextProtos(next_protos);
-}
-
-// static
 void HttpStreamFactory::EnableNpnHttpOnly() {
   // Avoid alternate protocol in this case. Otherwise, browser will try SSL
   // and then fallback to http. This introduces extra load.
   set_use_alternate_protocols(false);
   std::vector<NextProto> next_protos;
   next_protos.push_back(kProtoHTTP11);
   SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::EnableNpnSpdy3() {
   set_use_alternate_protocols(true);
   std::vector<NextProto> next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoSPDY2);
   next_protos.push_back(kProtoSPDY3);
   SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::EnableNpnSpdy31() {
   set_use_alternate_protocols(true);
   std::vector<NextProto> next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoSPDY2);
   next_protos.push_back(kProtoSPDY3);
   next_protos.push_back(kProtoSPDY31);
   SetNextProtos(next_protos);
+}
+
+// static
+void HttpStreamFactory::EnableNpnSpdy31WithSpdy2() {
+  set_use_alternate_protocols(true);
+  std::vector<NextProto> next_protos;
+  next_protos.push_back(kProtoHTTP11);
+  next_protos.push_back(kProtoQUIC1SPDY3);
+  next_protos.push_back(kProtoDeprecatedSPDY2);
+  next_protos.push_back(kProtoSPDY3);
+  next_protos.push_back(kProtoSPDY31);
+  SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::EnableNpnSpdy4a2() {
   set_use_alternate_protocols(true);
   std::vector<NextProto> next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoSPDY2);
   next_protos.push_back(kProtoSPDY3);
   next_protos.push_back(kProtoSPDY31);
   next_protos.push_back(kProtoSPDY4a2);
   SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::EnableNpnHttp2Draft04() {
   set_use_alternate_protocols(true);
   std::vector<NextProto> next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoSPDY2);
   next_protos.push_back(kProtoSPDY3);
   next_protos.push_back(kProtoSPDY31);
   next_protos.push_back(kProtoSPDY4a2);
   next_protos.push_back(kProtoHTTP2Draft04);
   SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::SetNextProtos(const std::vector<NextProto>& value) {
   if (!next_protos_)
@@ skipping 22 matching lines @@
         continue;
       }
       SetProtocolEnabled(alternate);
     }
   }
 }
 
 HttpStreamFactory::HttpStreamFactory() {}
 
 }  // namespace net