Remove SPDY 2.1 support.

chrome/browser/chrome_browser_main.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 "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 772 matching lines @@
 //           default group: no npn or spdy is involved. The "old" non-spdy
 //                          chrome behavior.
 void ChromeBrowserMainParts::SpdyFieldTrial() {
   if (parsed_command_line().HasSwitch(switches::kUseSpdy)) {
     std::string spdy_mode =
         parsed_command_line().GetSwitchValueASCII(switches::kUseSpdy);
     net::HttpNetworkLayer::EnableSpdy(spdy_mode);
   }
   if (parsed_command_line().HasSwitch(switches::kEnableSpdy3)) {
     net::HttpStreamFactory::EnableNpnSpdy3();
-  } else if (parsed_command_line().HasSwitch(
-             switches::kEnableSpdyFlowControl)) {
-    net::HttpStreamFactory::EnableFlowControl();
   } else if (parsed_command_line().HasSwitch(switches::kEnableNpn)) {
     net::HttpStreamFactory::EnableNpnSpdy();
   } else if (parsed_command_line().HasSwitch(switches::kEnableNpnHttpOnly)) {
     net::HttpStreamFactory::EnableNpnHttpOnly();
   } else {
 #if !defined(OS_CHROMEOS)
-    bool is_spdy_trial = false;
     const base::FieldTrial::Probability kSpdyDivisor = 100;
     base::FieldTrial::Probability npnhttp_probability = 5;
-    base::FieldTrial::Probability flow_control_probability = 5;
     base::FieldTrial::Probability spdy3_probability = 0;
 
     // After June 30, 2013 builds, it will always be in default group.
     scoped_refptr<base::FieldTrial> trial(
         new base::FieldTrial(
             "SpdyImpact", kSpdyDivisor, "npn_with_spdy", 2013, 6, 30));
 
     // NPN with spdy support is the default.
     int npn_spdy_grp = trial->kDefaultGroupNumber;
 
     // NPN with only http support, no spdy.
     int npn_http_grp = trial->AppendGroup("npn_with_http", npnhttp_probability);
 
-    // NPN with http/1.1, spdy/2, spdy/2.1 and spdy/3 support.
+    // NPN with http/1.1, spdy/2, and spdy/3 support.
     int spdy3_grp = trial->AppendGroup("spdy3", spdy3_probability);
 
-    // NPN with http/1.1, spdy/2 and spdy/2.1 support.
-    int flow_control_grp = trial->AppendGroup(
-        "flow_control", flow_control_probability);
-
     int trial_grp = trial->group();
     if (trial_grp == npn_spdy_grp) {
-      is_spdy_trial = true;
       net::HttpStreamFactory::EnableNpnSpdy();
     } else if (trial_grp == npn_http_grp) {
-      is_spdy_trial = true;
       net::HttpStreamFactory::EnableNpnHttpOnly();
     } else if (trial_grp == spdy3_grp) {
-      is_spdy_trial = true;
       net::HttpStreamFactory::EnableNpnSpdy3();
-    } else if (trial_grp == flow_control_grp) {
-      is_spdy_trial = true;
-      net::HttpStreamFactory::EnableFlowControl();
     } else {
-      CHECK(!is_spdy_trial);
+      NOTREACHED();
     }
 #else
     // Always enable SPDY on Chrome OS
     net::HttpStreamFactory::EnableNpnSpdy();
 #endif  // !defined(OS_CHROMEOS)
   }
 
   // Setup SPDY CWND Field trial.
   const base::FieldTrial::Probability kSpdyCwndDivisor = 100;
   const base::FieldTrial::Probability kSpdyCwnd16 = 20;     // fixed at 16
@@ skipping 1139 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }