Restrict kDisableSpdy pref to only disable SPDY/3.1, not HTTP/2.

components/network_session_configurator/network_session_configurator.cc

 // Copyright 2016 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 "components/network_session_configurator/network_session_configurator.h"
 
 #include <map>
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 88 matching lines @@
 
 void ConfigureSpdyParams(const base::CommandLine& command_line,
                          base::StringPiece spdy_trial_group,
                          const VariationParameters& spdy_trial_params,
                          bool is_spdy_allowed_by_policy,
                          net::HttpNetworkSession::Params* params) {
   // Only handle SPDY field trial parameters and command line flags if
   // "spdy.disabled" preference is not forced via policy.
   if (!is_spdy_allowed_by_policy) {
     params->enable_spdy31 = false;
-    params->enable_http2 = false;
     return;
   }
 
   if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests))
     net::URLFetcher::SetIgnoreCertificateRequests(true);
 
   if (command_line.HasSwitch(switches::kDisableHttp2)) {
     params->enable_spdy31 = false;
     params->enable_http2 = false;
     return;
@@ skipping 490 matching lines @@
                                     const std::string& quic_user_agent_id,
                                     net::HttpNetworkSession::Params* params) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   ParseFieldTrialsAndCommandLineInternal(
       command_line, is_spdy_allowed_by_policy, is_quic_allowed_by_policy,
       quic_user_agent_id, params);
 }
 
 }  // namespace network_session_configurator