Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1924)

Unified Diff: chrome/browser/io_thread.cc

Issue 1393713003: Remove insecure QUIC support from Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/io_thread_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 10e53586622223e4272c3633103a11a160871949..fcd5890fa32721feeb43c29bfa0ec700c24f219e 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -1053,7 +1053,6 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals(
&params->alternative_service_probability_threshold);
globals.enable_quic.CopyToIfSet(&params->enable_quic);
- globals.enable_insecure_quic.CopyToIfSet(&params->enable_insecure_quic);
globals.enable_quic_for_proxies.CopyToIfSet(&params->enable_quic_for_proxies);
globals.quic_always_require_handshake_confirmation.CopyToIfSet(
&params->quic_always_require_handshake_confirmation);
@@ -1179,8 +1178,6 @@ void IOThread::ConfigureQuicGlobals(
globals->use_alternative_services.set(
ShouldQuicEnableAlternativeServices(command_line, quic_trial_params));
if (enable_quic) {
- globals->enable_insecure_quic.set(
- ShouldEnableInsecureQuic(command_line, quic_trial_params));
globals->quic_always_require_handshake_confirmation.set(
ShouldQuicAlwaysRequireHandshakeConfirmation(quic_trial_params));
globals->quic_disable_connection_pooling.set(
@@ -1290,17 +1287,6 @@ bool IOThread::ShouldEnableQuicForDataReductionProxy() {
return data_reduction_proxy::params::IsIncludedInQuicFieldTrial();
}
-bool IOThread::ShouldEnableInsecureQuic(
- const base::CommandLine& command_line,
- const VariationParameters& quic_trial_params) {
- if (command_line.HasSwitch(switches::kEnableInsecureQuic))
- return true;
-
- return base::LowerCaseEqualsASCII(
- GetVariationParam(quic_trial_params, "enable_insecure_quic"),
- "true");
-}
-
bool IOThread::ShouldEnableQuicPortSelection(
const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kDisableQuicPortSelection))
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/io_thread_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698