From 3bb2c233b513394ef26ee69c90871c16d080524e Mon Sep 17 00:00:00 2001
From: bnc <bnc@chromium.org>
Date: Fri, 7 Nov 2014 12:26:39 -0800
Subject: [PATCH] https://crrev.com/708623002 disabled SPDY/3.0 support in
 Chromium.  This made the --disable-spdy31 command line flag useless.  (To
 disable SPDY support altogether, one can still use --enable-npn-http or
 --use-spdy=off.)

This CL removes --disable-spdy31, together with the obsolete functions NextProtosSpdy3() and NextProtosSpdy31WithSpdy2().  The latter has been unused for a while.

BUG=431299

Review URL: https://codereview.chromium.org/708963004

Cr-Commit-Position: refs/heads/master@{#303283}
---
 chrome/browser/io_thread.cc                   |  3 ---
 chrome/common/chrome_switches.cc              |  3 ---
 chrome/common/chrome_switches.h               |  1 -
 net/quic/quic_network_transaction_unittest.cc |  2 +-
 net/socket/next_proto.cc                      | 16 ----------------
 net/socket/next_proto.h                       |  2 --
 6 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 29c83a7895db..24064c6b97b4 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -800,9 +800,6 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) {
     } else if (command_line.HasSwitch(switches::kEnableSpdy4)) {
       globals_->next_protos = net::NextProtosSpdy4Http2();
       globals_->use_alternate_protocols.set(true);
-    } else if (command_line.HasSwitch(switches::kDisableSpdy31)) {
-      globals_->next_protos = net::NextProtosSpdy3();
-      globals_->use_alternate_protocols.set(true);
     } else if (command_line.HasSwitch(switches::kEnableNpnHttpOnly)) {
       globals_->next_protos = net::NextProtosHttpOnly();
       globals_->use_alternate_protocols.set(false);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 2f6dcace4dd3..8c5ef488e187 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -344,9 +344,6 @@ const char kDisableSearchButtonInOmnibox[]  =
 // Disables using bubbles for session restore request.
 const char kDisableSessionCrashedBubble[] = "disable-session-crashed-bubble";
 
-// Disable SPDY/3.1. This is a temporary testing flag.
-const char kDisableSpdy31[]                 = "disable-spdy31";
-
 // Disables the suggestions service.
 const char kDisableSuggestionsService[]     = "disable-suggestions-service";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index c777652ed52b..b3b00fa7aca6 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -102,7 +102,6 @@ extern const char kDisableQuicPortSelection[];
 extern const char kDisableSavePasswordBubble[];
 extern const char kDisableSearchButtonInOmnibox[];
 extern const char kDisableSessionCrashedBubble[];
-extern const char kDisableSpdy31[];
 extern const char kDisableSuggestionsService[];
 extern const char kDisableSupervisedUserBlacklist[];
 extern const char kDisableSupervisedUserSafeSites[];
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index 62fe895075e3..ab926d5dfd8d 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -214,7 +214,7 @@ class QuicNetworkTransactionTest
 
     if (use_next_protos) {
       params_.use_alternate_protocols = true;
-      params_.next_protos = NextProtosSpdy3();
+      params_.next_protos = NextProtosWithSpdyAndQuic(true, true);
     }
 
     session_ = new HttpNetworkSession(params_);
diff --git a/net/socket/next_proto.cc b/net/socket/next_proto.cc
index 4ae4511eddd7..1dcfb5d58f35 100644
--- a/net/socket/next_proto.cc
+++ b/net/socket/next_proto.cc
@@ -31,13 +31,6 @@ NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
   return next_protos;
 }
 
-NextProtoVector NextProtosSpdy3() {
-  NextProtoVector next_protos;
-  next_protos.push_back(kProtoHTTP11);
-  next_protos.push_back(kProtoQUIC1SPDY3);
-  return next_protos;
-}
-
 NextProtoVector NextProtosSpdy31() {
   NextProtoVector next_protos;
   next_protos.push_back(kProtoHTTP11);
@@ -46,15 +39,6 @@ NextProtoVector NextProtosSpdy31() {
   return next_protos;
 }
 
-NextProtoVector NextProtosSpdy31WithSpdy2() {
-  NextProtoVector next_protos;
-  next_protos.push_back(kProtoHTTP11);
-  next_protos.push_back(kProtoQUIC1SPDY3);
-  next_protos.push_back(kProtoDeprecatedSPDY2);
-  next_protos.push_back(kProtoSPDY31);
-  return next_protos;
-}
-
 NextProtoVector NextProtosSpdy4Http2() {
   NextProtoVector next_protos;
   next_protos.push_back(kProtoHTTP11);
diff --git a/net/socket/next_proto.h b/net/socket/next_proto.h
index 465001d4b5b7..89400a9ee4d1 100644
--- a/net/socket/next_proto.h
+++ b/net/socket/next_proto.h
@@ -51,9 +51,7 @@ NET_EXPORT NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
                                                      bool quic_enabled);
 
 // All of these also enable QUIC.
-NET_EXPORT NextProtoVector NextProtosSpdy3();
 NET_EXPORT NextProtoVector NextProtosSpdy31();
-NET_EXPORT NextProtoVector NextProtosSpdy31WithSpdy2();
 NET_EXPORT NextProtoVector NextProtosSpdy4Http2();
 
 }  // namespace net
-- 
2.11.4.GIT