Deprecate SPDY/3.0 support.

This CL removes SPDY/3.0 from the list of supported protocols for the NPN and ALPN protocol negotiation extensions. BUG=428086 Review URL: https://codereview.chromium.org/708623002 Cr-Commit-Position: refs/heads/master@{#303140}
dednal · Nov 7, 2014 · 4c3b71b · 4c3b71b
1 parent 0cde643
commit 4c3b71b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
@@ -897,11 +897,11 @@ void IOThread::EnableSpdy(const std::string& mode) {
     if (option == kOff) {
       net::HttpStreamFactory::set_spdy_enabled(false);
     } else if (option == kDisableSSL) {
-      globals_->spdy_default_protocol.set(net::kProtoSPDY3);
+      globals_->spdy_default_protocol.set(net::kProtoSPDY31);
       globals_->force_spdy_over_ssl.set(false);
       globals_->force_spdy_always.set(true);
     } else if (option == kSSL) {
-      globals_->spdy_default_protocol.set(net::kProtoSPDY3);
+      globals_->spdy_default_protocol.set(net::kProtoSPDY31);
       globals_->force_spdy_over_ssl.set(true);
       globals_->force_spdy_always.set(true);
     } else if (option == kDisablePing) {

diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc
@@ -81,7 +81,6 @@ TEST_F(IOThreadTest, SpdyFieldTrialHoldbackControl) {
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11,
                           net::kProtoQUIC1SPDY3,
-                          net::kProtoSPDY3,
                           net::kProtoSPDY31));
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   EXPECT_TRUE(use_alternate_protocols);
@@ -93,7 +92,6 @@ TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Enabled) {
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11,
                           net::kProtoQUIC1SPDY3,
-                          net::kProtoSPDY3,
                           net::kProtoSPDY31,
                           net::kProtoSPDY4));
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
@@ -106,7 +104,6 @@ TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Control) {
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11,
                           net::kProtoQUIC1SPDY3,
-                          net::kProtoSPDY3,
                           net::kProtoSPDY31));
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   EXPECT_TRUE(use_alternate_protocols);

diff --git a/net/socket/next_proto.cc b/net/socket/next_proto.cc
@@ -15,7 +15,6 @@ NextProtoVector NextProtosHttpOnly() {
 NextProtoVector NextProtosDefaults() {
   NextProtoVector next_protos;
   next_protos.push_back(kProtoHTTP11);
-  next_protos.push_back(kProtoSPDY3);
   next_protos.push_back(kProtoSPDY31);
   return next_protos;
 }
@@ -27,7 +26,6 @@ NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
   if (quic_enabled)
     next_protos.push_back(kProtoQUIC1SPDY3);
   if (spdy_enabled) {
-    next_protos.push_back(kProtoSPDY3);
     next_protos.push_back(kProtoSPDY31);
   }
   return next_protos;
@@ -37,15 +35,13 @@ NextProtoVector NextProtosSpdy3() {
   NextProtoVector next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoSPDY3);
   return next_protos;
 }
 
 NextProtoVector NextProtosSpdy31() {
   NextProtoVector next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoSPDY3);
   next_protos.push_back(kProtoSPDY31);
   return next_protos;
 }
@@ -55,7 +51,6 @@ NextProtoVector NextProtosSpdy31WithSpdy2() {
   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);
   return next_protos;
 }
@@ -64,7 +59,6 @@ NextProtoVector NextProtosSpdy4Http2() {
   NextProtoVector next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoSPDY3);
   next_protos.push_back(kProtoSPDY31);
   next_protos.push_back(kProtoSPDY4);
   return next_protos;

diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
@@ -55,7 +55,7 @@ SpdySessionPool::SpdySessionPool(
       // |default_protocol_|.
       default_protocol_(
           (default_protocol == kProtoUnknown) ?
-          kProtoSPDY3 : default_protocol),
+          kProtoSPDY31 : default_protocol),
       stream_initial_recv_window_size_(stream_initial_recv_window_size),
       initial_max_concurrent_streams_(initial_max_concurrent_streams),
       max_concurrent_streams_limit_(max_concurrent_streams_limit),